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

Bug: 142003500
Change-Id: I50e64e9607d520b93674ad54a1ae08d1d3e3c69c