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

Bug: 264720040
Merged-In: Ie7623a4b6fd2101fb6acd5be7584a9e4cbf0e3e4
Change-Id: Ie8c4ea8ea264bf6be78b96df3aba1d5828a90aed