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

Bug: 275386652
Merged-In: I05e91ef3b328ed7911bf536f54ee77c4f197eb92
Change-Id: I8344437844e444a2a90dee4617f5f71bf3ce85f3