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

Bug: 248070379
Merged-In: I9e3f2f5d3cebad6c29a70e5067fc596d5a8d1e54
Change-Id: Ia9e8db41784bc435b19898407b35c645a8b04c78