Merge "Revert "Enable AIDL HAL support in the framework"" into main