Merge "NetworkCapabilities: fix describeImmutableDifferences"