[automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: bac2216679 -s ours am: 2f22097eb3 -s ours am: 1f0a09988e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iecd138b018057bca638e9d42be738a96cf7477ad