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

Bug: 134405016
Change-Id: I4dd4276ada501f1ad20936d2e84a740807bce5f6