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

Bug: 275386652
Merged-In: I37ca7d0b5eec178f993770ba806fc428b7eda0c8
Change-Id: If24bfd238bf87d11b4107887c0a60afc06206743