Merge "Keystore 2.0 SPI: Update KeyInfo and KeyGenParameterSpec" am: 17f24b5799 am: 7d49ae705e am: 7662e81e98 am: b90d33bd18

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470091

Change-Id: I5728741cdd66f9b6ba6f39310c796cb8b12758e5