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