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

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

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