[conflict] Merge "Make ANGLE loadable from system image." into main am:...

[conflict] Merge "Make ANGLE loadable from system image." into main am: 08efa6ba am: 99fecf1f am: 826244e8

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



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