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

Bug: 264720040
Merged-In: Idae7ad9580f3c98e5f253e9e0627f68f5f87967b
Change-Id: I31038175caac1de60cbbe53b3862ddeef7c14269