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

Change-Id: I98f5c4916e4c0e72888788e92b2f6a5b0a0a87d2