Here comes the dispute. I personally believe once the AP expires (usually within 1 year), AOS automatically kicks in. H-1B expiration date on I-94 is NOT relevant.
Contrary to the common sense, the H-1B alien has to extend his or her H-1B status even before the originally approved H-1B stay. However, U.S. immigration law has never been following the common sense.