Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 7b327e1bef am: 098ac69976

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I890d00fa46d9623bc7d391379ac9b77b7f33703d