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