[automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 65f4f4a371 -s ours am: 0494b8ae1c -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf1b60498d2cf80de737a1a81c75ced8e7409638