Merge "Swap contexts when unmapping ExternalTextures" into sc-dev am: 95c0a88900

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

Change-Id: Id0b3fd37587a9a5e633987b15a5be41487391770