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

Bug: 275386652
Merged-In: I2bb9d93d39215ca3653e2e4353391b50b7ab6417
Change-Id: I64f4f827b0c7c7a3a0233ebae0c5f333f2e33070