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

Bug: 264720040
Merged-In: Ib41fa4321fe2bc084856880feaab147a541fa2ea
Change-Id: I21cfba9e9ef0a6646285882c689ee3c082f4e130