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