Merge "Backporting of fix for listing key aliases." into android11-gsi