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

Bug: 142003500
Change-Id: I1cfe37283a3bef805c3cf90e9cd563fa08cd3de4