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