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

Bug: 275386652
Merged-In: I2a032d7406eef67191e299225467163332c925dd
Change-Id: I2028c8d7629783c605287a1ed4073530f16d9540