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