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

Change-Id: If05b82ba029bfce142c42eebd3336ca3d5bded3d