Merge \"Merge \\\"Mark app pending intents in notification extras\\\" into nyc-dev am: b2cd9c95bf am: 7878e736f7\" into nyc-mr1-dev-plus-aosp
am: fdf2884ded

Change-Id: Icdb52b4cf95f06d7777c799eda133ca7b7eafa74