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

Bug: 248070379
Merged-In: I991728196424b9949ddbdc4ebd24d57251bf7429
Change-Id: Ic5818b8551b080e8719224253c5c970ae2bf0280