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