Merge Android 13 QPR2

Bug: 273316506
Merged-In: I980e75363b4bd089152515d208df4e65130a722b
Change-Id: Ib25740221b9d6d7d2403c0729c2ce89dbd378690