Merge "Reintroduce EGL mitigations from Android P." into qt-dev am: 97071fa058
am: 970cac1945

Change-Id: I17baae0b1d201ce90624fea139f51f1210e1afb5