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

Bug: 142003500
Change-Id: If730deeb81ad046a2d6c4ffbd90e2d185ac36bea