Merge branch 'jb-mr0-release' of...

Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/frameworks/base into aosp-merge

Conflicts:
	packages/SystemUI/res/layout/status_bar_expanded.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
	services/java/com/android/server/SystemServer.java
	telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
	telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

Change-Id: I0f435852a82b2db10a6ec804e3b829a52ba0c577