Merge "Fix SerializeFileDescriptor." am: fc1abd7197 am: f4b86766fd am: 9d1e11b1fc am: 259f2e9c6a am: 04e950f8df

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

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