Merge "Fix misspelling in SurfaceTexture#attachToGLContext javadoc" am: 234748cd64

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

Change-Id: I0b18ed00490bb9f585d4ab26dd686cf441dbfef3