Merge "ANGLE is part of system image." into main am: 4480e9b9cd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798519

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