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

Bug: 275386652
Merged-In: I392de610b3d3e044e23c83d29fd11061fbc7192d
Change-Id: Ib64b6b991713c518faaab01935cad9e8a57e0d98