[automerger skipped] Merge "OpenGL: fix initializeAnglePlatform with built-in...

[automerger skipped] Merge "OpenGL: fix initializeAnglePlatform with built-in ANGLE driver" am: f75a5aa1 am: 41f56f81 am: 9e25b96c am: 9883129d -s ours

am skip reason: Change-Id I0e4ecf65fac0d91b5542d475439e1e6f9541b629 with SHA-1 b4d93521 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1458682

Change-Id: I4ec9df059761e0573d4b3ab553348893168789a3