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

Bug: 142003500
Change-Id: I133b5a11c3de241fd5be2f0cec155f7c758d9f2d