Merge "Add empty keystore2 crate" am: f7ee95d340

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

Change-Id: Iade99f7b798cd80778c5b10483d77752ee8726d8