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

Bug: 275386652
Merged-In: I33b21d3cc5f3819bb7ac7a7592cacd462a00145e
Change-Id: I272995b77303589b009ed0a06feb50f0c768ac08