Merge "Plumb 2 EGL surface attributes to ANGLE" am: 412da8194d am: c3843ac878

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

Change-Id: I290fc8f60f2ed6e3552c18029f8d66c90c261a19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>