Merge "Fix fd leak while bypassing transcoding in media APIs" into sc-dev am: 3fefc5c3ed

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

Change-Id: I88486c8e7278e5899405a379034a453ed95b19f9