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

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

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