[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: 28c265faa2 am: 49f3c17e52
am: 870e0a7b7e -s ours
am skip reason: subject contains skip directive

Change-Id: Ie3f580acfc2772a3f716329297a948828b6106f4