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