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

Bug: 264720040
Merged-In: Ie53d02712a65ff8250dddc2e3f3dd5453be9e9ae
Change-Id: I176a9dbe91a655c4d02ebff7001492ff6cdaf6a3