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