Merge "Allow Uninstantiated Test SapTest" am: 8c0e3f1ac7 am: b4753d48f8 am: 2fddf3144a

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

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