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

Bug: 275386652
Merged-In:
Change-Id: I4ec2edf49e4fa94af972a8024fecf05f55c5da29