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

Bug: 275386652
Merged-In: I7b61985080f2f09bec6670f0fd1a874971ea9019
Change-Id: If954d8c05f876124217f9e946a7b5c15bb920714