Merge "Revert "Destroy EGL context on colorfade.stop"" into udc-qpr-dev am: 968471b3

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



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