Merge "Plumb 2 EGL surface attributes to ANGLE" am: 412da819 am: c3843ac8...

Merge "Plumb 2 EGL surface attributes to ANGLE" am: 412da819 am: c3843ac8 am: 7692db70 am: b635a857 am: 631108b6

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



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