Make sure to always update pending intent.

Otherwise, when having a successful download first and a failure
afterwards, the extras won't be properly cleared.

Change-Id: I2df918af7eb330898f5801aa741920a782ea6779
Merge remote-tracking branch 'cm/cm-10.2'; commit 'HEAD' into HEAD