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