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: I709dd7cab4165db16a33463977d96bd74d4a5962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>