Merge "Keystore2: Batching listing of key entries" am: 4ec7585ff8 am: 6e5fe5015b

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

Change-Id: I21a4dd3e2a6f4ec2864223e5d96d29d1b1d8d454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>