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