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

Bug: 275386652
Merged-In: I602c1c22b868a12d030eba27b5d4b436b2b4b4cd
Change-Id: I6afecededa4fe0c1a02d19099a0872901e270b27