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

am skip reason: Change-Id I0acf75c92b04a2f83301410f2001f63c25ecf3c9 with SHA-1 43e3bf110c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88c74ba5e0cce51e7106bf410744afbc74a7cd5c