Merge "Fix return values in AIDL multi-HAL shim" into tm-dev