Merge "Notify user switch event to NetworkController"
am: 1aa24246cf

Change-Id: I1c2cefbc0fff7d90a4c2a0314c3697ee198caab5