Merge "Run SAP tests on slots based on configs" am: ef8b4bee56 am: a16e677d82 am: 6a57e5041d am: 8e64385bc4

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

Change-Id: I2f293ec184565f14b168241bc8e1f0c276d87e98