[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 0869bc39ad -s ours am: 99713c39c7
am: cccc1fd5b1

Change-Id: I89e72502f7891dcd66481d19cceb0f162837ed7b