Merge "IpManager: add display name for helpful logging, and Network"
am: ed0b030e17

Change-Id: I9b5fb4b995e351dfed74bfe83993e379c87305d6