[automerger skipped] Merge "Enable ANGLE as a Game Dashboard Intervention"...

[automerger skipped] Merge "Enable ANGLE as a Game Dashboard Intervention" into sc-qpr1-dev am: 4de992c9 am: f9387616 -s ours am: cfd56213 -s ours

am skip reason: Merged-In I91894a76b8dcf7a97244cff679a501001734f671 with SHA-1 08c3f5b3 is already in history

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

Change-Id: Ia7fbab8cd6906c76f745c994b19fa871427b0b94