[automerger skipped] Merge "Remove unnecessary type and dup for fd" am:...

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

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

Change-Id: I3efcc32fbaed1b19242d6481dfe8b119e5eb08e4