[ISap hidl2aidl] Compat Support am: 1d10db6063 am: ba72751bc4

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

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