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

Bug: 264720040
Merged-In: Ia9505a2247bd129665ed3b1ca87f701f7e4c48f6
Change-Id: I3d61fb85c91db59022c796672c2d09bfaa95f732