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