Merge "Add empty keystore2 crate" am: f7ee95d340 am: 540936b9cc

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

Change-Id: I2db63fb772ffa33dc2bce9618c024b6163bf7b28