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