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

Bug: 142003500
Change-Id: I09d6d10764cdb9df6f4ff1d4cb98c71a1efade49