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

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

Change-Id: I8ee8db246ec8fa95fe50edc4ce2501617760e637