Android 13.0.0 Release 54 (TQ3A.230605.012.A1)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ice557e4c16f16e3e1d1370ba289471d71ea853fa