Make one method slightly less useful to save others

Specifically, adding the record to the enqueued list outside of
the handler meant that a cancelAll followed by a repost could
prevent the repost from succeeding.

Test: cts verifier
Change-Id: I4faf15f39f8fe7455c389c455420c22c763e23bd