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

Bug: 248070379
Merged-In: I76a5283a4f4397f4b65420b8a9cd0455249c50f1
Change-Id: I7ae701a4b49b3ba2bd3dea7e13c282a14df4c688