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

Bug: 142003500
Change-Id: I6e006c412e2c8fb5d66e55425cbe4cbc8c6c5879