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

am skip reason: Merged-In I1580ad533651c03741c55c625a0e70a614fe111a with SHA-1 e6458eaa84 is already in history

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

Change-Id: Ib5795370a325ce13313141de48152923d4263858