Merge changes from topic "isap_hidl2aidl" am: 249e4eb8

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



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