[automerger skipped] [ISap hidl2aidl] Compat Support am: 1d10db60 am:...

[automerger skipped] [ISap hidl2aidl] Compat Support am: 1d10db60 am: ba72751b am: 1be5623a -s ours

am skip reason: Merged-In I9fe5fe194de877bcd2b85ccfa822bd6565e2dc72 with SHA-1 25fb3aac is already in history

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



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