Merge tag 'android-13.0.0_r52' into int/13/fp3

Android 13.0.0 Release 52 (TQ3A.230605.012)

* tag 'android-13.0.0_r52':
  Backporting of fix for listing key aliases.

Change-Id: I50560775beed6086738b32b44c2abeb0f229d6e6