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