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

Bug: 275386652
Merged-In: I07bdadd81f6992445b11e21dc08a68c231e8d5b8
Change-Id: I4797503f4d036c6f90243c04a8cc311149c9473f