[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: d6651f2888 -s ours am: 565a5cb181 am: 9618806e79
am: f93a7b709f -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb252abaa924d807cfc967cb5ff8762519cdc15f