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

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

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