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

Bug: 264720040
Merged-In: Iab6f115a57b94a85e3c371bc8d7ebebbf552884c
Change-Id: Ic112f122f943b44165a4eb811ca2329566f1d483