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

Bug: 275386652
Merged-In: I1318f21c21ec9b3fe9577ac3b9f32605e7f7f13a
Change-Id: I388901402686a55d0a584fdcec51e024ecd5134b