[automerger skipped] Merge "[Cherry-pick] Clean up EGL Loader." into main am:...

[automerger skipped] Merge "[Cherry-pick] Clean up EGL Loader." into main am: bf8e3666 am: 53753189 am: e71d6a38 -s ours

am skip reason: Merged-In Ibc62bf59ed7b0cb3671583d2af853c457977d1d1 with SHA-1 1b07384b is already in history

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



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