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