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