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

Bug: 142003500
Change-Id: I614e79e7b1663b6d5fbb659bf77fcdb0d711ab14