Merge "Keystore2.0 database.rs: Add storing and loading key parameters." am: 73c3d220a4

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

Change-Id: I1eedfda3fc53e715ce6f11fa3df4308cb89516b0