Merge "Fix SerializeFileDescriptor." am: fc1abd7197 am: f4b86766fd

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2080240

Change-Id: Ieb4603ebded28cff3a560a1f669b772322cbf1bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>