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

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

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