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

Change-Id: Ia69626f61d00be9a6da3655111999f70423325c9