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

Change-Id: I488241a317f2ff0604e2c99baca810eec57ce166