Merge \\\"Mark app pending intents in notification extras\\\" into nyc-dev am: b2cd9c95bf am: 5f7f3fa7a9
am: dc162dde07

Change-Id: I42000bbb614139ee3f0d9a9fcee7f460e52661f8