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