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

Bug: 248070379
Merged-In: I6c384d1baccdd876139a59f664e01a7fb05571b8
Change-Id: Ib2e7178e8d55d98904c865c86a096251b0814716