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

Bug: 146167222
Change-Id: I4cdfb21aa5c9d47445f1d7e6d0b944c65aa52596