DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master Bug: 146167222 Change-Id: I90fe9945822d5169ff12e9b5f3a49373c0162d7a