Merge "FileBridge: fix fd ownership mismanagement." am: e80c7cb69a am: bc2ef840e1

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

Change-Id: I5016af13c2b9ee3032daa345b82f7479a6ba5072