[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: dfe64a2342 -s ours

am skip reason: Merged-In I2ad173ddded3c865cf78794a5f218cfc8a89c16b with SHA-1 f0fba372a9 is already in history

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

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