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