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

Bug: 248070379
Merged-In: Id9e135fd35f61816fa4d04bffaa6308da388b687
Change-Id: I7a92b7a544f772eef77b429aaeefd28cba6b8367