Merge "Fix up NetworkCapabilities' toString"
am: 7959e70ef2

Change-Id: I21e66bc78a763f9e37725f50ca8b406ac7259518