Revert "Goodbye msim"

This reverts commit f5b10b1694ab14a6736bc52c76becee7602fd808.

Conflicts:
	Android.mk
	core/res/res/values/config.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
	packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
	services/java/com/android/server/SystemServer.java
	telephony/java/android/telephony/ServiceState.java
	telephony/java/android/telephony/SignalStrength.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/RILConstants.java

Change-Id: I3dcedc47736a57aa74e4bba282e9126b6ff720c5

Conflicts:
	Android.mk
	core/java/android/app/ContextImpl.java
	core/java/android/content/Context.java
	core/java/android/net/MobileDataStateTracker.java
	core/java/android/net/NetworkIdentity.java
	core/java/android/provider/CallLog.java
	core/java/android/provider/Settings.java
	core/res/res/values/cm_colors.xml
	core/res/res/values/config.xml
	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
	media/java/android/media/MediaScanner.java
	packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml
	packages/Keyguard/res/values-es-rXA/cm_strings.xml
	packages/Keyguard/res/values/strings.xml
	packages/Keyguard/src/com/android/keyguard/CarrierText.java
	packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
	packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/res/layout/signal_cluster_view.xml
	packages/SystemUI/res/layout/status_bar_expanded.xml
	packages/SystemUI/res/values/cm_dimens.xml
	packages/SystemUI/src/com/android/systemui/quicksettings/AirplaneModeTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTypeTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/WiFiTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/TelephonyRegistry.java
	services/java/com/android/server/connectivity/DataConnectionStats.java
	services/java/com/android/server/net/NetworkPolicyManagerService.java
	services/java/com/android/server/power/ShutdownThread.java
	telephony/java/android/telephony/PhoneNumberUtils.java
	telephony/java/android/telephony/PhoneStateListener.java
	telephony/java/android/telephony/SignalStrength.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ISms.aidl
	telephony/java/com/android/internal/telephony/ITelephony.aidl
	telephony/java/com/android/internal/telephony/IccCardConstants.java
	telephony/java/com/android/internal/telephony/PhoneConstants.java
	telephony/java/com/android/internal/telephony/RILConstants.java
	telephony/java/com/android/internal/telephony/SmsConstants.java
	telephony/java/com/android/internal/telephony/TelephonyIntents.java
	telephony/java/com/android/internal/telephony/TelephonyProperties.java
Add link control support

Add support for link control while sending
multiple messages.

Change-Id: I1e9009d2ba24512d03186a11a34dfddf484c2b8e
CRs-Fixed: 608922
Validity Period support for MO SMS in 3gpp

Add Telephony framework support for Validity Period in 3gpp
for MO SMS

Change-Id: Iee7358ca1971441f0567e428b587562294fe29bb
CRs-Fixed: 627981
Add new Card Unavailable reason for SIM power down in APM.

REASON_APM_SIM_POWER_DOWN value added to CardUnavailableReason enum.
This is to indicate card absent event received when SIM is powered
down in APM.

Change-Id: I985e06d629715ebc0489a2fb19e908ab652bfeeb
CRs-Fixed: 661325
decouple SW FLP and HW FLP overlay flags

currently there is only overlay flag shared by SW FLP and HW FLP. This
change allows having different overlay setting for sw / hw FLPs.

Change-Id: I643fa70380e7568ae851d23e87917a5b4b599fe8
CRs-Fixed: 622338

Conflicts:
	services/java/com/android/server/LocationManagerService.java
Combo Provider: Get the package name from resource

Get the package name for combo provider from resouce
instead of hardcoding the name. Also, geofence services
provider is renamed to differentiate from the hal
geofence provider

CRs-fixed: 608477

Change-Id: I84739e440d688d6e1784aa5ab4e2074eaa740bab

Conflicts:
	core/res/res/values/symbols.xml
Combo Provider: Specific location screening

Only screen network locations if Combo provider is
the connected network location provider.

CRs-fixed: 608477

Change-Id: I513bddae9cff493dd9aac4460168864548e4bfb4
Fix for crash in LocationManagerService

Resolved issue where MockProvider was being cast to
LocationProviderProxy and would cause a fatal exception.

Change-Id: I7c8c83961dd03d59292e773b01995ed6b3ac04c7
CRs-fixed: 619882
Add support for default data subscription setting.

Default data subscription setting holds the default preference for data
subscription. It will be updated when user changes data preference,
sub deactivated or card removal.

Current set preferred data subscription API does not update the default
data subscription preference. This change is to handle temporary DDS switch
by apps like MMS.

New APIs to update and retrieve the default data subscription are added.

Change-Id: I495266cff2a5319c57279d9decb77d6a87bbfae8
CRs-Fixed: 642210
CallLog: Support for active time in CDMA call log

Display the type(Active time/Call out time) in call log of CDMA call.

Change-Id: Icdc459b0e6aff2ae7f9d44395b6886232de16efe
Ringtone: Add support for selection of phone ringtone for SIM-2.

-Issue: "The process android.process.media has stopped" pop up is
 displayed when ringtone for SIM-2 is selected.
-Rootcause: There is no type and URI defined for SIM-2 ringtone
 in the RingtoneManager. This is leading to SQl exception when
 executing a selection query.
-Fix: Add URIs for the SIM-2 and SIM-3 ringtones. Define
 interfaces to return them to app side based on subscription ID.

CRs-Fixed: 612945
Change-Id: If68c2d008dd86d2b55d3fb7f5667bbadc238d0b3

Conflicts:
	core/java/android/preference/RingtonePreference.java
	media/java/android/media/Ringtone.java
	media/java/android/media/RingtoneManager.java
Provider: Add multi SIM ringtone support in SettingsProvider

This change will handle multi-sim queries in
SettingsProvider.java when openFile and
openAssetFile APIs are called by other components.
Thus, it will ensure to play the correct ringtone
corresponding to the SIM.

CRs-Fixed: 661216
Change-Id: I7b22c233b9c41669c1ad948b83a7aa2c55442af1

Conflicts:
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
Fix translucent navigation bar layout on tablets in landscape.

The status bar blocker view was visible and stretched over the whole
navigation bar, even though it's not even needed on tablets, as the
status bar never extends into the navigation bar there. Fix that by
hiding the blocker view, but keep it in the layout in oder to not
clutter the code with null checks.

Also cleanup unneeded method override.

Change-Id: I50d58e6e3496516b37f8c36b497cf8c9f569325c

Conflicts:
	packages/SystemUI/res/layout-sw600dp/navigation_bar.xml

Conflicts:
	packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java