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

Bug: 142003500
Change-Id: I3907f111f33f7d3f9b9bba1b7db8bd3451f3785f