Merge "Remove AFileDescriptor_{get,set}FD" am: a7b5bc2f67

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1706750

Change-Id: I4c6ae3541f5e6096498954231d884637a518f495