[automerger skipped] [automerge] Fix textarget in s_glFramebufferTexture2D 2p: 219aa7b175 am: 96efa2b5eb am: 7efa95e75e -s ours am: 169ee4dfa6 -s ours am: 310bfb0492 -s ours

am skip reason: Merged-In I145e933c49f93fb54936761445c4d5b172c28d65 with SHA-1 219aa7b175 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/18906804

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