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