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

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

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