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

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

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