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