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

Bug: 264720040
Merged-In: I80f56f9865672006130c1f29ada35321e02232aa
Change-Id: I2bcfb1b49c7eeac905e7b7fed76325ed663a1cc9