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

Change-Id: Ib0a0ebe7f6bcfad87687dab367615373b740f236