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

Bug: 146167222
Change-Id: Iad78224bc116fa2e0cbbca8e01e2b0e3636408cb