[automerger skipped] Support for P256 curve in RKP for Strongbox am: cd3823df6f am: 22f91810af -s ours am: b85158ace7 -s ours

am skip reason: Merged-In I0972d4e7755d02e138aeb7e9780adfafd1fbfce0 with SHA-1 374c5096b1 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2964842

Change-Id: I920bacbb48095ae3bbf45ff50ab8e369ced2f3f7
Signed-off-by: Automerger Merge Worker <[email protected]>