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