Merge "Add functionality to Keystore 2.0 database module." am: 501a974912

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

Change-Id: I7047e259671193e73f02217afdc57d549e8ca992