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

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

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