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

[automerger skipped] Remove temporary workarounds in AIDL HAL config processing am: ba506887 -s ours am: c9dd628e -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: Ic62514b47010ed2b66adf304fc289cc6d6cf18eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>