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