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

Bug: 275386652
Merged-In: I2266b46a987b77aabcbe4594c064163be50d2fba
Change-Id: Ic7d11e3f7f1b6c10fd395587dc30913fe2d74342