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

Bug: 248070379
Merged-In: I77b937775fa774c700b9a080a92bbeb9d80f5d32
Change-Id: I197005aa837d502942094b071cae2b97c7a71d41