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

Bug: 275386652
Merged-In: I0c90b3c776c6da1fa64afae3f7dc3a039bc9c75e
Change-Id: I0dc077c3e9e33315e524603a1ee9cfa5fccdb017