Port "Fix display of mobile status bar icon when using airplane mode"

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java

Patchset 2
- rebased

Change-Id: I8d42fbab709a400294f4ab59aba0f37e2fe8b40d