Merge "media: trivial implementation of MediaCodec.detachOutputSurface" into main am: 86bf87a99a

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

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