Merge "Fix misspelling in SurfaceTexture#attachToGLContext javadoc" am: 234748cd64 am: 90e9921817 am: 8661f99909

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

Change-Id: Ic63a1cc63ecfcee8c610ac7ce3595c4d51e326a9