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