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

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

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