[automerger skipped] Merge "Revert "Destroy EGL context on colorfade.stop""...

[automerger skipped] Merge "Revert "Destroy EGL context on colorfade.stop"" into udc-qpr-dev am: 968471b3 am: 17a3f6a3 -s ours

am skip reason: Merged-In I2e3683ce72cb75a500fbe5e17ddbad8c2e5ddb9b with SHA-1 f10b36aa is already in history

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



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