Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: f6346af47e am: 8dfb91df6c am: 722c71ed8b
am: edea5c8266

Change-Id: Ie5df14e0ea1c12e0cfabe87978ac6c9b744353b2