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

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

Change-Id: I1814cbe79fb6cba1cd4f94137ea65e98b22da93e