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