Merge changes from topic "isap_hidl2aidl" am: 249e4eb8 am: 94563473 am: 6f5c255d

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



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