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

[automerger skipped] Merge "Destroy EGL context on colorfade.stop" into udc-qpr-dev am: 3338e290 am: 265626ba -s ours

am skip reason: Merged-In I60226f55a8d819c6f74e1dcc782b9c4201dcba4b with SHA-1 02dae0c6 is already in history

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



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