[automerger skipped] Merge Android 12 am: 12e23d0f91 -s ours

am skip reason: Merged-In I5e6d1f815848beed302adcb643ca9cd9bae5a31e with SHA-1 d378c44714 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/1847357

Change-Id: I63f481953dc8c1a3224898f616dabffb279ce665