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

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

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