Merge "Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev am: 1b3877a965  -s ours" into oc-dr1-dev-plus-aosp