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