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