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

Bug: 264720040
Merged-In: I982f7aa9f862f4883a47c8c57ecd7341a9cbd7ec
Change-Id: Idb1087ba0ae38563be4ee8dbbde7d3cb0491be25