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

Bug: 264720040
Merged-In: I9b1408b72df34a0d0cbcc1b99e9617f15bc47558
Change-Id: I67745cdf3b0e7b0815f8a8eb8513ebd853f8a61f