Merge Android 13 QPR2

Bug: 273316506
Merged-In: I6d9f142e46ba25dc4e19883b593a0f7349a61ecf
Change-Id: I2d802ad9ba56df1dbdad6ee8278531a253224b1c