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

am skip reason: Change-Id I91cbfe74165d1a8f7b7d95edabb10be208ec54a2 with SHA-1 65f4f4a371 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie64c99529aa70f71af9d568b58e4155162ef91a3