[automerger skipped] Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev...
[automerger skipped] Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev am: 4f179bb1 am: a3204b25
am: 17d5d812 -s ours
am skip reason: change_id I6759339000eb239112c0c83ce1131f34164ee0cf with SHA1 40abbb0f is in history
Change-Id: Ic70ff70f8bd0d43997f09e1f3154b20dbd675fbf