Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev