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

Bug: 248070379
Merged-In: I9b0a89d5642403b6d2893e8231d4200147c18eb1
Change-Id: Iada01ca90f8580882e711f97a3975439c1365c5b