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

Bug: 248070379
Merged-In: I84ad65b397ac38f30f2a4a8ad8ba384fbb50abdb
Change-Id: I6cc0fcc229ce37b200d14d7c3590b23fccce2e8c