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