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

Bug: 264720040
Merged-In: I00ac895f62785893b52660a7dafa1dad05a711f6
Change-Id: I0fe8cc5e5ff0dbea026428b2e599c735e54904de