Merge changes I95292030,I5dde6cd2,I63fc32dc,I0024ee60,I19619ef6, ...

* changes:
  Hack to force ConnectivityService to maintain 2 Wifi connections
  ClientModeManager: delay resetting role until ClientModeImpl has stopped
  Log ClientModeManager broadcasts
  MBB: Queue broadcasts in CMI & CMM
  SupplicantStateTracker: migrate TAG to getTag() to log ifaceName
  MBB: notify ConnectivityService of new primary CMM and linger