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