[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad -s...

[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad -s ours am: a3ca7b04 -s ours am: 39dd57ee -s ours am: 9f4d3990 -s ours am: 0695895c -s ours

am skip reason: subject contains skip directive

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



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