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

Change-Id: I082ad1d8426245e26a1301c9b82d7e62cd3e4b33