[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: f59c3864fe -s ours

am skip reason: Change-Id I829eb4215ea9aa15adf66e8bbdb37ec88a9bb6a4 with SHA-1 3fe5adf3ad is in history

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

Change-Id: Idf35c7c48f2ee6a6da2bc84e56284cb665173896