Merge "Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev am: 4f179bb174 am: a3204b25e9" into qt-r1-dev-plus-aosp