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

Bug: 275386652
Merged-In: Ifef165f9136193295955657636ed5112820b9564
Change-Id: Id2411b22bb627ce7fc0f006f1f1fbbfe174bb1ff