[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 83583a78db -s ours am: aa959b7dc2 -s ours

am skip reason: Merged-In I5a4b8dce759e4ce9ebc4ca1e613fe1dd355e403f with SHA-1 c0c27ebb88 is already in history

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

Change-Id: I1580ad533651c03741c55c625a0e70a614fe111a