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

Change-Id: I4fea829b6bdef18fdd9d2ec0988ff6085cdf3314