Merge "Allow Uninstantiated Test SapTest" am: 8c0e3f1ac7

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

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