Merge "Trigger recovery agent PendingIntent in KeySyncTask"