[automerger skipped] Merge "Remove usage of GlEngine" into tm-qpr-dev am:...

[automerger skipped] Merge "Remove usage of GlEngine" into tm-qpr-dev am: 5538ee1c am: c741fbb9 -s ours

am skip reason: Merged-In I0bfbe9b6aee7a4da349b412399196504511b69f0 with SHA-1 3a4b3bf1 is already in history

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



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