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

Bug: 275386652
Merged-In: I16deb4617e547a32f40297f08a645f391b20f53b
Change-Id: I55c5d0f4f82245552d4c4f1940020eed14bdede3