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

Bug: 142003500
Change-Id: Ic92c338cf829e9f9c762a47b2ba9ddcac818ef4e