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