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

Bug: 275386652
Merged-In: Id8d1cb1d5cb6b7068112331c2962039b81084da5
Change-Id: I6e825eb9db458a5f298eaa5d9a9bf352996cfc1b