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

Change-Id: Ib20ff1f481753b97ad31e17907567f3c4ed12f6c