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