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

am skip reason: Merged-In I424f45bc30ea8e56e4c4493203ee0749eabf239c with SHA-1 1ff38ab3 is already in history

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



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