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