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

Bug: 264720040
Merged-In: Ia275a2ab69ee31b7d81a2ca8c83bef08cbf107df
Change-Id: I7d4f8d91bb43f0094687c9bc74bda2d7aef3d124