[automerger skipped] Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE am: 75e53c541e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5e6d1f815848beed302adcb643ca9cd9bae5a31e