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

Bug: 248070379
Merged-In: Ic2c1f4551c86f43a91dfa0bf6546eea8049eb957
Change-Id: Ia45bb46cab690595f7714d1b832b81a5e66487e2