Merge branch 'jb_mr2' of git://codeaurora.org/platform/packages/providers/TelephonyProvider into qcril

Conflicts:
	src/com/android/providers/telephony/TelephonyProvider.java
Handle database upgrade for MSIM

Change-Id: I7c37252900bf0a61fdd64b301ab5b852711a42e5
TelephonyProvider: Handle database upgrade for MSIM

* need to add a boolean field 'preferred' to the carrier table in telephony.db

Change-Id: I522fcc75ed4835e6498542d9567118cd03606d2a
MmsSmsDatabaseHelper: increment database version to force the upgrade

Change-Id: Ie63c69da3b5924eb13e142302c815c5dbc4b8f19
telephony: Add support for choosing a default APN

 * Sometimes, the standard method of choosing the "first" available APN
   is not what we want. Consider the case where a certain provider has
   both a "normal" APN and an LTE APN. The LTE APN is what we want, but
   it's not chosen.
 * Add a new overlayable value "config_preferred_apn" to handle this. A
   device can override this. The format is "apn,mcc,mnc".

Change-Id: Ia6ca4159491bee15b3f18ad7ad524b8b0ffce2f2