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