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

Bug: 248070379
Merged-In: I003b84ac122acbb46125c30be6ee423c096d074c
Change-Id: I32fc494dfa4f247dd733605814a5dd61a9b41ab4