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

Bug: 189946434
Change-Id: I94c24f1d066a2c211ccd3afbe164f94544bb2221