Merge "Shorten the output of NetworkAgentInfo#toString()." am: 6f2c32ff38

Change-Id: I73e47e19588a758fbee07ae96670b126251a9b56