Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev