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

Bug: 248070379
Merged-In: Ic97678251a4962f44bef005b612359f43cf106f4
Change-Id: Iae243accbd20f5de61f82fcbc75c27c2cbbf005a