DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: I0d0c8e794b7d6f56297825d8195ebc6dd313b3f8