Merge "Remove temporary workarounds in AIDL HAL config processing" into udc-qpr-dev