Merge "FileBridge: fix fd ownership mismanagement." am: e80c7cb69a am: bc2ef840e1 am: 5cc3eac681 am: 58c615fbaa

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

Change-Id: I9dcad087714df784820af2b2439478928dfa5555