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

Bug: 264720040
Merged-In: I8173068cd5a470569455a4a58eb81beae600acd5
Change-Id: I2bda4eaab54dd1393b941d82471342705106d622