Merge "Use P521 curve instead of P256" into sc-dev am: 664ea465c2

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/15160990

Change-Id: Ibbfdf8e8368db8ac1c856484579c03e839ed6d4c