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