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

Bug: 248070379
Merged-In: Ie6a8f5153086ce7d645bf56f02def446dbb4dee5
Change-Id: I7fe3fd62207d95c6a2a54878ed4ca5f1065c39af