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