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

Bug: 275386652
Merged-In: I8a3d03e18fb5745ffc644f3b2b2f0b63fe3f755d
Change-Id: I3f53dfbaaebd24d2e10bc2691636163acb1c5e06