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