Merge "Merge "Fix file descriptor ownership." am: 72376bf0 am: c495455b" into rvc-dev-plus-aosp am: 62e0c8cd am: eb87819d

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

Change-Id: I0d82c3fac49ece3ac3ebc1e6998d50efe95abfed