[automerger skipped] Merge "Make 'IHalAdapterVendorExtension' unstable again"...

[automerger skipped] Merge "Make 'IHalAdapterVendorExtension' unstable again" into main am: 07be6481 am: 5c203509 -s ours

am skip reason: Merged-In I040e7bce41d21fa2a63280a7c218c6b68240edcd with SHA-1 e0540ea2 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3364110



Change-Id: I9cc16e648d04d66c41d0be1131bb27bf82671fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>