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

Bug: 142003500
Change-Id: I15f515e70aa9ae0fdbc5c06e61784f38dcd70a60