[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2b57ca5c -s ours

am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc8 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2130212



Change-Id: I5992b8ca6c5293098ff6d8f3f5ebfd09415de471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>