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

Bug: 264720040
Merged-In: I7f0df766ce3e1025421252bf1c986c4d403e0a1f
Change-Id: I061828ef4143b65f23d56426f3a0d66eb56d7502