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

Change-Id: I430c5907288ac4fdbaae8062ca410424b28123be