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