[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master
am: 3638874ef7 -s ours
am skip reason: subject contains skip directive

Change-Id: I7c9b2660e1c704439231f31f7792150d09e3bf2f