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

Bug: 134405016
Change-Id: Ie2a04b16f1d2c9fa1514c6f7647bdda61639f765