[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: c0c27ebb88 -s ours am: fd344b3b9d -s ours am: 4d61cac1bd -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7424408b20d709de47413105201bd6152754fda8