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