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

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



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