[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 skip reason: skipped by user bduddie

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

Change-Id: I073e42e1724069d6f5b07388d5d02352b103bc25