[automerger skipped] Merge "Align AIDL HAL config reporting with legacy" into...

[automerger skipped] Merge "Align AIDL HAL config reporting with legacy" into udc-qpr-dev am: bd02ea8c -s ours am: c32d3809 -s ours

am skip reason: Merged-In Ifc645d0b1318ceaa6a3935bf470f2d045d518800 with SHA-1 1f8cf3d2 is already in history

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



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