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

Bug: 189946434
Change-Id: Ia785e81876f708250d38c81bb0702077a1a177e6