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

Bug: 275386652
Merged-In: Iedbb9eea589b56e81e044603c958f0b2c4cb3720
Change-Id: Ia6b3905b3864b3ce3cf73f59cd9bea940903e451