[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: 4881f0316c -s ours am: f03dcbc4ee -s ours am: c4d165cac6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I719298285fc3c7e73cbc493317d7e9dc9d7c2512