Merge "Fix up NetworkCapabilities' toString" am: 7959e70ef2 am: 773523a667
am: 669194a830

Change-Id: I3d3f3f34f30b69750e197b185c4e70bd360f35e0