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

Bug: 142003500
Change-Id: I0c5eaff91ca6f75c970aa5d3ec71dce659b12b6a