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

Bug: 248070379
Merged-In: I5a1fd64f9101caa29d87d9f65bd4d17b8bd77059
Change-Id: Ia49878fd6f70239c3ed1f91129719c5ee60066a5