Merge "Keystore 2.0: Make KeyParameters serializable." am: b174ed0494 am: d45301258e

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

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