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

Bug: 248070379
Merged-In: I9982c8c04024f016e8ef27d0e35d8d3eaff72f0f
Change-Id: I555a8c54e1a405b6210a26af2fc20e4da6d593df