Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 6e269ec6fe
am: 359f2215eb

Change-Id: I633d6347a7f852c27c03fc96b36ca2a60f70c73c