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