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

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

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

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