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