Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" am: 39efdb2451 am: 2de3786907

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If57e12227a2735853911ca6271a211571ddb633b