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

Bug: 264720040
Merged-In: I62f7f67a376a5a3382b2cddf584a884652009ee0
Change-Id: I7c6f867656aa5e85a702eeb051892e27c5ae0363