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