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

Bug: 264720040
Merged-In: I9ca1643c37cf1ccdfecff4bfd0f405718be75669
Change-Id: Id93e1d5501f36d130c985433ad73c4b9d1c91a88