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

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

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