[automerger skipped] Merge "Fix fd leak while bypassing transcoding in media...

[automerger skipped] Merge "Fix fd leak while bypassing transcoding in media APIs" into sc-dev am: 3fefc5c3 am: 39b2de9b -s ours am: 84f61329 -s ours

am skip reason: Merged-In I978257bbc4a8f6813b6e6a5ce22124257204f432 with SHA-1 366493ed is already in history

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

Change-Id: I86ff82142d653ada6aab3ed53092f307ca2375a9