Merge "Support Parcel.write/readFileDescriptor" into aosp-main-future