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

Bug: 248070379
Merged-In: I94e6e6b9f5c65db300c3548681303c8496b489be
Change-Id: I425ae469935ce8f547d969d4fde2b5cadffb99b5