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

Bug: 248070379
Merged-In: I53efd9739140b46f9980ea49411bc7099b19493d
Change-Id: Ibb5952004aacfb4fe2c58b3e77e5430e0b370a38