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

Bug: 142003500
Change-Id: I5de5a5a2a1e4d7fd9812d707603ce1afbec9b39b