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