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

Change-Id: I0315afe6893150b66b9ad6cb34d2ea4198b7c21e