Allow calling of voicemail using CALL_PRIVILEGED

Bug: 18456519
Change-Id: I97bd63a726ca9bc6412266a5592696daf96e912d
Merge tag 'android-5.0.2_r1' into lollipop

Android 5.0.2 release 1
Telecomm: Add support to set ring tone for SIM2

Can set different ring tone for SIM1 and SIM2.

Change-Id: Ie715e2c2d7e3760f7d0fe9ba2a9ecdafd9a42277

Conflicts:
	src/com/android/server/telecom/AsyncRingtonePlayer.java
	src/com/android/server/telecom/Ringer.java
Propagate the call substate changed message to the UI

Change-Id: I0465c65d9ac7af22cac544f6404056d0c2094cf4
CRs-Fixed: 749824
IMS Call Extras Feature

Adding support to allow OEMs to send
extra information with the Dial Intent all the
way to the IMS service layer and beyond.
Similarly, extras for MT calls are propagated
from IMS Service layer till the UI layer.

Change-Id: I351d32c15494c7df5d00c05053368fd5fa17b49b
CRs-Fixed: 724860
Handle NumberFormatException gracefully.

Handle NumberFormatException at relevant places
when subId is parsed as Long.

Change-Id: Ie245c840a9aa394629a4eff86f10cecaa5ec2955

Conflicts:
	src/com/android/server/telecom/Ringer.java
Creating connections for conference event package participants.

- Add "addExistingCall" method to Connection service wrapper to handle
the creation of new calls for connections which already exist in telephony.
- Fixed but in setIsConference message where an isValidCallId check made
outside of the handler would result in a newly added call NOT being
marked as conferenced due to a race condition.  The MSG_SET_IS_CONFERENCED
handler already checks if the call exists before performing its operation.

Bug: 18057361
Change-Id: I2348c8e6985cd831f2cae56b37dfcb33bae014a8

Make add-call a global property of telecom. (2/4)

ADD_CALL didn't make sense as a property of Connection or Call.
This changes it to be a global property instead.

Bug: 18285352
Change-Id: I5189e114e74dba2d81d74c6d24cf5b17f1e0922a

Set appropriate capabilities to TestConference

This allows the "Manage conference" screen to show up correctly
for test conference calls

Bug: 18269622
Change-Id: I8467654a8158c5da8c354057f613f122b22a0ed3

Create IMSConference to represent IMS conference calls.

- Removing check in ConnectionServiceWrapper which would prevent adding
a new confernece with no calls in it; an IMS conference by default will
have no calls.

Bug: 18200934
Change-Id: I2e70b9350e779310e8c4ee8e91bc8020b126bcfa

Change-Id: I2e70b9350e779310e8c4ee8e91bc8020b126bcfa
Temporary fix to enable Addcall button on UI.

Temp fix to enable UI option addcall.

Change-Id: I5b436bcccad05b86c02a0ee9d5ed2bbc3d8feade
telecomm: Remove dead code, fix build.

Change-Id: I570c59ca9e48ad71180a8e5cf0f9be37a9b2b14f