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