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