Merge "Adds non reader/writer based HAL 2.2 tests for AIDL composer3"