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

Bug: 264720040
Merged-In: Ia8a0e9fe0ef6c57a772979e5cd5ee4eef8b86322
Change-Id: Ia3768b424d45656173619f1e53613053ab0db08d