[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: afb344009e -s ours am: 16fdac9558 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I83c9051a5af3e2ee372cedf27cfec8deec66aa72