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