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

Bug: 142003500
Change-Id: I3cb6f2cf639cfea24033a226a2cca5b9ec0aeac7