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

Bug: 275386652
Merged-In: I00f8ba9bea7bd36b52ae66250233230cac22ae83
Change-Id: I70029148f373fde343c965fd7913faa6f93a72d2