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

Bug: 142003500
Change-Id: I1b89bc92d1bf2073e2c4e1c5e2ae523a83d93869