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

Bug: 248070379
Merged-In: I8f2d9bbe7aa60679dc225d50b7adf1457bba4e7b
Change-Id: I8d46bb6470ed5050d12901bc32819aa2d02fa3e8