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

[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: d05c0b93 -s ours am: 21377beb -s ours am: 9992e582 -s ours am: 950463a6 -s ours am: af507bc5 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128478



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