Merge tm-qpr-dev-plus-aosp-without-vendor@9129937

Bug: 248070379
Merged-In: I7bcc252f8edda63d8e132835580daf244eef0014
Change-Id: Ibd05ae7f228482a5f443070f7fc596124c13576c