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