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

Bug: 264720040
Merged-In: I1a4be70606201ad12d704620873e4ad0e1f6c0e6
Change-Id: I617d863c6460583c70890d6011f716ea0c2e4a10