Merge "Fix return values in AIDL multi-HAL shim" into tm-dev am: 80246dfc am: 36a58a4e

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



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