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

Change-Id: Ia43deddb28ebe93d300ffc93599a8ff9b9b320a8