Merge "benchmark: updated benchmark tests for strongbox" am: a30c3933 am:...

Merge "benchmark: updated benchmark tests for strongbox" am: a30c3933 am: a8f53c63 am: fbe0169a

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



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