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