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

Bug: 248070379
Merged-In: I08178b4796d4558e1599a17863c171e8353c5b4c
Change-Id: Ic086e3742297aa564e48fabbc646fbef5665d574