Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994

Bug: 275386652
Merged-In: I45c112ac996b2c54f5bac268b7b3c46b0b983ef6
Change-Id: I727fec021cb08b6949ca7a08779a8ccd022698d0