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