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