[automerger skipped] Merge "Remove excess dependency on libGLESv2" am:...

[automerger skipped] Merge "Remove excess dependency on libGLESv2" am: bcc93cdc am: 346bb593 am: 9ed78f12 -s ours am: 30cca664 -s ours am: e4d86cbd -s ours

am skip reason: Merged-In Ia9d94d8b294ad1c3d30d4794bf71d4f6da7dc623 with SHA-1 7994df26 is already in history

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



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