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

Bug: 275386652
Merged-In: I32db277bd7b4747a38e2dfa09bf39ccab6500e1e
Change-Id: Icad9af57dd72743c81f928baf3f1c50c1020125e