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