Merge "Close ParcelFileDesciptor properly" into sc-v2-dev am: bae76ba745

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

Change-Id: Ifc4e740a0b1576a7ae615d1b296aa2b3456ecd11