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

Bug: 142003500
Change-Id: Ifac6544a4fd96b34031fc91e5c8d1df4e38f84c8