Merge "benchmark: updated benchmark tests for strongbox" am: a30c39330f

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

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