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

Bug: 142003500
Change-Id: I47fa4ba4ec61055b7744a6574916e4d8cf8dcc1d