Merge "[surfacetexture] Add patch to release current EglImage" am: 4334485270 am: 20934502e7

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1956042

Change-Id: I514f88249ab87bab77a2d5671f915b6da1632523