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

Bug: 189946434
Change-Id: Ib7c13d4209d9d0d73f08ec2c2792c23471a4a5d7