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