Merge "Shorten the output of NetworkAgentInfo#toString()." am: 6f2c32ff am: 18d49f72 am: cd8587cf Change-Id: I2684ca967356da99766738f323e90465b245858a