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

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

Change-Id: Ic79f503fe35621651294c99dfe8d1f37ff4edd36