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

Bug: 248070379
Merged-In: Ie5ca5b7a60339ae8cdebc67ba4d44218ad7f071e
Change-Id: I71eb1a3b4b7a08ddfdb1a12316eaddff94d57b13