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

Bug: 248070379
Merged-In: I16c80978f017437dc34980bca697f4ca863e6986
Change-Id: I4d2a885d756ddc634adee4289d8e4cf3da6f04ce