Merge "IP connectivity metrics: NetworkEvents have transports" am: f8fdb06c27
am: f3ada43f6e

Change-Id: I8cd50ea805fe3e533c0fc21b220827155cb0d23b