Merge "Remove unnecessary type and dup for fd" am: 5428551ba9 am: f8f2391f8e am: 667ef2c4c7

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

Change-Id: I478c73f7214b48c259b684dc8c09b25a2da80cf5