[automerger skipped] Merge "[Cherry-pick] Avoid unloading ANGLE." into main...

[automerger skipped] Merge "[Cherry-pick] Avoid unloading ANGLE." into main am: 329a0430 am: 87425707 -s ours am: 3e528b70 -s ours

am skip reason: Merged-In I82b6408405ef7c507e50ab259204bdce95fda110 with SHA-1 1224faa7 is already in history

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



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