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

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

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