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