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

Bug: 248070379
Merged-In: I93dab0c5a25a1f623f250a3870d86f0e17272b23
Change-Id: I4b526e07f12b84275938937ac05de7caabfe145f