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