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

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

Change-Id: I6f79ceb6c9310297d7d9900bab20678a7d136e2b