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