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

Bug: 248070379
Merged-In: I06f680220671171481f850735f6093799466eea4
Change-Id: I984547cc1cc51454d9ff70bc1834d6c1a1ea8e60