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

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

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