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

Bug: 248070379
Merged-In: Id6ea009658072b376dbaca016bb58b3af51c32de
Change-Id: If16597144ba307022fa61613a624ff9d6edf3f1e