Merge tag 'android-4.3.1_r1' of https://android.googlesource.com/platform/frameworks/base into aosp-plus_4.3

Android 4.3.1 Release 1

Conflicts:
	core/java/android/net/MobileDataStateTracker.java

	modified:   core/java/android/net/MobileDataStateTracker.java