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

Bug: 264720040
Merged-In: I8ae63a8cc393722ec13125364ab2bde35f46dbe6
Change-Id: I59dc82e4252390f30a3ce497de0e819b0f4c1f49