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

Bug: 142003500
Change-Id: I44f7cb8ccfc0486e1c507e12aff8bf1409beac6f