[automerger skipped] Merge "Indicate ANGLE is present on devices" am:...

[automerger skipped] Merge "Indicate ANGLE is present on devices" am: 27ca29a3 am: 288133d9 am: 29a62efb am: 9a31e9ef am: 7cd1fdbf -s ours

am skip reason: Change-Id Ide4e3d8f78d3748d557a47ecd153d66694fd1e3a with SHA-1 26f2850c is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1395711

Change-Id: I254d7d413b3017fd73887eeb1e5fa84c003182ce