Merge "Fix StrongBoxOnly test" into rvc-dev am: ba1a4c7f6d am: c35d2f8534

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

Change-Id: I2f53bb934f9ec597b40cec59f9a90c32325bd853