[automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: bac2216679 -s ours am: 2f22097eb3 -s ours

am skip reason: Merged-In Iba9d4f0b69b7c6bffcc85a4e3f110dea5e48cf8e with SHA-1 aa959b7dc2 is already in history

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

Change-Id: Iaa58fca12b868b2bcbf80d8c57b1199d3f5906eb