[automerger skipped] Merge "Remove temporary workarounds in AIDL HAL config...

[automerger skipped] Merge "Remove temporary workarounds in AIDL HAL config processing" into udc-qpr-dev am: 328c31cf -s ours am: e6799d06 -s ours

am skip reason: Merged-In I1b614e62a28ae1662a3c7fccce62aa943da9431d with SHA-1 0ee6cb9b is already in history

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



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