Merge "Strongbox may not support 1024 bit key size for RSA." am: 453ec12115 am: cde000ed4b

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

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