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