Fix disappearing wifi and mobile icons

Summary: resolved issue where wifi / mobile status disappears from the status bar

Test Plan: enable / disable aosp mode and chck if icons return

Reviewers: randall.rushing, Mustaavalkosta, Roach, synergy

Reviewed By: synergy

Differential Revision: http://review.codefirex.com/D295
Merge branch 'jb-devel-mr2-release' of github.com:codefireXperiment/frameworks_base into jb-devel-mr2-release