Merge tag 'android-4.3_r2.2' into jb3

Android 4.3 release 2.2
Merge tag 'android-4.3_r3' into jb3

Android 4.3 release 3.0

Conflicts:
	core/java/android/net/ConnectivityManager.java
	core/java/android/net/IConnectivityManager.aidl
	data/sounds/AudioPackage11.mk
	services/java/com/android/server/AppOpsService.java
	services/java/com/android/server/ConnectivityService.java

Conflicts:
	core/java/android/net/ConnectivityManager.java
	core/java/android/net/IConnectivityManager.aidl
	docs/html/about/versions/android-4.3.jd
	docs/html/distribute/googleplay/spotlight/index.jd
	docs/html/index.jd
	services/java/com/android/server/ConnectivityService.java
Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/frameworks/base into jb3

Android 4.3 Release 3.1

Conflicts:
	services/java/com/android/server/ConnectivityService.java