Merge Android 13 QPR2

Bug: 273316506
Merged-In: I2ffb9c251fa2eba33cf1de9ea537c1182927b167
Change-Id: Ie8d326adde2877f7fb9875f0d36c83ef088d7719