Merge "OpenGL: fix initializeAnglePlatform with built-in ANGLE driver" am: f75a5aa19f am: 41f56f816a am: 9e25b96c20

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

Change-Id: I2ffad82210b9d863e7efdf9490de75161e05d3f3