[automerger skipped] Merge "compat matrix: add ISap slot2" into main am:...

[automerger skipped] Merge "compat matrix: add ISap slot2" into main am: 031aeee8 am: 7285a113 -s ours am: 6c5c7fb1 -s ours am: cbdda7c3 -s ours am: efb76091 -s ours

am skip reason: Merged-In I2de4f1365a6981a0a2ef7165c916fba91a340799 with SHA-1 719f6465 is already in history

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



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