Merge "Logging improvements when NetworkCapabilities change" am: f60a38e152 am: bdfb4ee19c
am: 88a572da7d  -s ours

Change-Id: I5f6e3a2109236f30d0e09bde8a2c63b32e62f772