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