Merge "media: support MediaCodec::detachOutputSurface" into main am: 9c389cccd8

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

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