[automerger skipped] Merge Android 12 QPR1 am: 58baa890fb -s ours am: baaad6e229 -s ours

am skip reason: Merged-In I404ee8c2afe5ca547526c29b0aa6e079db15bc1d with SHA-1 18ec440913 is already in history

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

Change-Id: I8e4226bee38d695473e7013803d4b40ea2a802cd