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

Bug: 134405016
Change-Id: If598307fc629a5661d5a6071e1714f5f5e1a1ee1