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

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

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