[automerger skipped] Merge "Read ro.hardware.egl for ANGLE's filename" am:...

[automerger skipped] Merge "Read ro.hardware.egl for ANGLE's filename" am: b617c4f1 am: aeecba91 am: 2090f2f5 -s ours am: 7aba0545 -s ours

am skip reason: Change-Id I462e076fc500d84fa2a27abfa491f82db4a9df80 with SHA-1 422326f3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78bb0628751c97b3c0e47cd43009400a3d771f9c