[automerger skipped] Backporting of fix for listing key aliases. am: 1be9d2754c -s ours

am skip reason: Merged-In I5e8543a25dd9f1bb504fbc23f35779da0a0153b0 with SHA-1 6e1213f5f5 is already in history

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

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