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