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