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