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

Bug: 264720040
Merged-In: Ia7151517ef492b1747acbb7b14d055b3ccba3b34
Change-Id: I79a8bcb2d7e82379e80b390bbf806d7805039e0d