Merge changes from topic "presubmit-am-b8ca5387cf2444ff9a850aadfac52f65" into tm-mainline-prod

* changes:
  [automerge] Fix return values in AIDL multi-HAL shim 2p: eae8adf209
  Fix return values in AIDL multi-HAL shim