[automerger skipped] Merge "Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev am: 4f179bb174 am: a3204b25e9" into qt-r1-dev-plus-aosp
am:30e808154c-s ours am skip reason: change_id I6759339000eb239112c0c83ce1131f34164ee0cf with SHA140abbb0fe9is in history Change-Id: I5bcd06d9de77af051d8caa309a499ffac9afe4a1
This commit is contained in: