Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23345338 Change-Id: Ic8325571466b6d382a9c7e359ffa8c0d1e6b37b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>