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

am skip reason: Merged-In I871ae28179ea91f3b4a189148676c335b1e7000b with SHA-1 afb344009e is already in history

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

Change-Id: Idc398cd43d8a0a155c3238be2f2af2601ececf3a