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

Bug: 248070379
Merged-In: Ie774ec691c1005f3eb37600db6b25da57b9a88ea
Change-Id: Id57c486fb89ab69de40131b51c5fa1eaf47f06de