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

Bug: 248070379
Merged-In: Iad7403dcbc0ad12b77154003f4aa61afedf2224f
Change-Id: I9935427749553aeb99b8682c8dd63b0af392d275