[automerger skipped] Backporting of fix for listing key aliases. am: 1be9d2754c -s ours am: 58e830e045 -s ours am: fa5a72fe98 -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: Ic1b615ee49fa8be049d8e3b9a5d4120dc881ece7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>