[automerger skipped] Merge "Remove unnecessary type and dup for fd" am: 5428551b am: f8f2391f -s ours am: 1d060bf0

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1374049

Change-Id: If2911244e96f0f35c8ca1ad9fa93986bcad5bb69