Merge "Proper duping / closing of FileDescriptors" into sc-dev am: cd776827 am: d6560de9 am: 6a6eab7d

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

Change-Id: If4e9a1fe8dcac353046eb6c67b89c16a981e2c40