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

Bug: 248070379
Merged-In: Ic44637e1b98e9fd716582dcad9ff1b7e07fb311f
Change-Id: I97f705373c162420c3bd6b9b0ae97a9752a48ab1