Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." into nyc-mr2-dev
am: c75ab85cd2

Change-Id: Ie343e7b86b970f2d934b964eebe924f74b0138d2