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