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

Bug: 264720040
Merged-In: Ibaf777f5e1320e4cf6a8988c7570984cd807309e
Change-Id: If1204610a9b10d6ccb916fdcc15bbb19f67c0070