DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master

Bug: 146167222
Change-Id: Id8e7d526904a9ae3a9f2b2e40dc1e4b8cf7bf1a0