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

Bug: 275386652
Merged-In: I74aeba2004bde944f2b855e4f8a8823d1dca94ba
Change-Id: I6d1afe053a8aa6a0b068accabe5f10c09e001e0b