Merge "Add Rsa 2048 import key test for strongbox." am: aeb7117596 am: 10dd6c409f am: 992f82a2ba

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

Change-Id: Ief66410985a0bcc646e13cf62e6eb50f469c34e0