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

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