[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 18ec440913 -s ours am: 8220cf57d8 -s ours

am skip reason: Merged-In I27cece8320b92d25e5e10dddfd541f7aeb56527f with SHA-1 6437b333a6 is already in history

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

Change-Id: I7f91686d8d692ddf9928f00144333a1b41b5633f