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

Bug: 142003500
Change-Id: I29d09faf12d082f55f075ed8f197b08b9ab8c8aa