Fix issue where sending 'stop' pendingintent would resend 'start'.

This was due to the pending intent being updated in two places, so the
start intent was overwriting the stop intent's extras. Have switched to
intents with non-matching actions to avoid filterIntent() related bugs
in the future.