Merge "Fix return values in AIDL multi-HAL shim" into tm-dev am: 80246dfcc1 am: 36a58a4e07 am: 6feba36ad4

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17696540

Change-Id: Iffafe9c61c5d1e402748adc24db5a20ca13b63d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>