Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am: 80ff5ecd4a am: cdcc931d93
am: 62c1d307e3

Change-Id: I05da79d601d412270a71026bbbad3c516a785422