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

Change-Id: Icb5b33008f97eaefd67bb4e5acd1e38bcf2dcb70

Conflicts:

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

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