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