Merge "Fix fd leak while getting original media format fd" into sc-dev am: 1b3bcc1352

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/15420650

Change-Id: Icfb65fac0d11b7f7660d6bf55e12e89cf9fd95e4