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

Bug: 248070379
Merged-In: Ie6749dcf2adfe81d73d5553297a1a4244f9a1e9a
Change-Id: I72444901a8e2bc16ccd897ea44a5d10a7548823e