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

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

Change-Id: I16ca58573c9730b1a1ef250adedfec2275925ddf