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