DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor@6129114

Bug: 146167222
Change-Id: Id59bf56295dc294fd44e3390933ae17d5c8291ff