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