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