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

Bug: 142003500
Change-Id: I39f95911ac893e7c03e7c3ec29ebe9af21fc927b