Do not always call setIsConnectedToProvisioningNetwork(false)

Previously I was calling setIsConnectedToProvisioningNetwork(false) always,
but all MDST's receive every broadcast. Thus we could over write an MDST's
mNetworkInfo.mIsConnectedToProvisioningNetwork to false, unless the MDST
that was set to true was last, i.e the code was order dependent.

If the provisioning networks value was false instead of true
when handleMobileProvisioningAction was called we wouldn't invoke
mdst.enableMobileProvisioning because network info would be null.

Thus the provisioning network would never transition to CONNECTED and
a default route wouldn't get setup and the browser couldn't access the
website.

Now setIsConnectedToProvisioningNetwork is only set to false when the
apnType matches and we won't indiscriminately change it and are not
order dependent.

Bug: 10853805
Change-Id: I68a4f9bdf5dc18d90f4cdef7a60811f57be67261
Fix mismerge in core/res/res/values/config.xml (duplicate definition)
Fix mismerge in packages/SystemUI/res/values-fa/strings.xml
fix duplicate definition in core/java/android/net/ConnectivityManager.java
PackageManager: Let system-defined permissions take precedence over settings

If a permission was already present in the device's settings due to having
no prior system definition, and the system tried to take it over
(after a version upgrade, for example), it'd fail, since the saved
value would clobber the one previously read from the permissions XML.

This breaks system-behavior changes (gid grants, in particular) unless
the user performs a factory reset after upgrading, which isn't acceptable.

Change-Id: If2e44110f6db735ad29cdf1086e814bd1299e290
Fix certain setting writes being incorrectly skipped.

If a value that previously had a very long value (over the 500 char
threshold) is now set to null, isRedundantSetValue would incorrectly
return true even though the value was changed.

Change-Id: Ia5304743024ec01024be98aa51ed260d38caf93c
Fix data connectivity issues

Merged from SuperNexus (Credits: Faryaab)
Revert "Wrong notification tone played for secondary user sometimes"

This fixes the force closes at mms settings and deskclock.

This reverts commit 1bacc52e5dee72e7ebc15a2ec377f3534353c61f.
merge android-4.3.1_r1
frameworks/base: Fix memory leak in BitmapRegionDecoder

When un-supported image is passed to bitmap decoder, mStream object
of SkMemoryStream class is leaking its resources. This is getting
called frequently when gallery app is trying to render unsupported
thumbnails in album view

Change-Id: I1d9401310566b529d81b406213f4e37be3104d95
Merge commit 'd559367bbab7516dedc973958304771efbf40481' into jb-4.3