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