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

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

Change-Id: I81da86d18bf68b9656d2ab950b28bba981b6dad7