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