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

Bug: 264720040
Merged-In: Id998c69ca1dccbd3108c2e78f065521cdac45135
Change-Id: I0f402850afc5f8e7b09e112b8d9ab4f13d949cbe