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