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
IMS-VT: Upgrade/Downgrade change

-Add isVideo API to VideoProfile.VideoState

Change-Id: I0b0b5cc9f59102767dc6947528838b38f18ee38e
frameworks/base: add app launch timeline instrumentation

Displayed Activity is often being used to measure application
launch times. However Displayed Activity only accounts for a
subset of the app launch. This additional instrumentation will
allow for more accurate measurements of applications launch
times.

ActivityManager: Update timeline debug statements
Update the timeline debug messages so that
'ActivityManager' is not used as the tag in log
messages as it interferes with some CTS tests.
CRs-fixed: 628703

This commit combines the changes from KK gerrit 668250 & 543988

Change-Id: I0af42520dc30d89a910e60aebdddf0c4fdd32b3e
Bluetooth: Avoid the crash in LEScanClients following BT process restart

Due to sudden crash and restart of BT process, BTLEClient object to call
is not valid and throws the NullPointerException.

Change-Id: Ie3b98149e83afc5b84b042ce61978eb1599dce49
CRs-Fixed: 729372
Enable NSRM (network socket request manager)

NSRM is a feature to synchronize app socket requests
to reduce network signalling and there by save some power.

Change-Id: Ice992713994045d0582f8cfb7b6761e2689f2555
Conflicts:
services/core/java/com/android/server/AlarmManagerService.java
AppOps: Check user permission before audio recording.

Add permission check before audio recording.

Change-Id: I55c8397df3169e031bba951cf180fa8c5f4c4ce0
Conflicts:
media/java/android/media/AudioRecord.java
Remove SystemServer dependency for DpmService

Remove SystemServer dependency for DpmService and
use AlarmManager and PowerManager services.

Change-Id: I346970ff36acbeaa123e9b550a620ff01137bd75
BootAnimation: Play boot/shutdown animation and music

Add support to show customized boot and shut down animation, as
well as music.

Change-Id: I69c87640175a96a18833a763a34afd362bbfb487
Conflicts:
cmds/bootanimation/Android.mk
cmds/bootanimation/BootAnimation.cpp
Revert "Freeing frame map"

This reverts commit 0c1eeb3c8ab53954218d3b8f4be08ff21be3e985.
Change-Id: I535330edb636f9457beed0849147168eaa6ae2ec
Conflicts:
cmds/bootanimation/BootAnimation.cpp
Bootanimation: Fix the low memory device oom when run boot animation

Low memory device is easily to be oom when run boot animation. Here
we do optimize the boot animation GL Texture only one frame needed.
That is free timely and re-init it again. When in boot animation,
the fps=15, so it is ok to do the delete and re-init.

CRs-Fixed: 572325
Change-Id: I1e81c3d0f3600ac895f9bd7bd00a284f3d4b7d4c
Telephony: Add 7bit Ascii support for long messages

Add config item for 7bit Ascii encoding and decoding
support for long messages

Change-Id: I54080a5c63fd2dc470f38edeffbe58729c22adf9
Conflicts:
core/res/res/values/config.xml
Add support for DSDA.

1. Interface changes to inform local call hold and setActiveSubscription
telephony service from telecomm service.
2. Interface in Telecomm manager to query active subscription and switch
to other subscription.
3. Add support in PhoneAccount to maintain LCH & active subscription
information.
4. Interface changes to inform sub switch between inCallUI and Telecomm
service.

Conflicts:
telecomm/java/android/telecom/Call.java
telecomm/java/android/telecom/ParcelableCall.java
telecomm/java/android/telecom/Phone.java
telecomm/java/android/telecom/TelecomManager.java
telecomm/java/com/android/internal/telecom/IConnectionService.aidl
Change-Id: I942122eab45a19ea30abc92c90228d9115c1df78
Conflicts:
telecomm/java/com/android/internal/telecom/ITelecomService.aidl
MSIM(DSDA): Keep the tone ids consistent with Audio module

Keep tone ids of TONE_LOCAL_CW, TONE_SUPERVISORY_CH & TONE_HOLD_RECALL
consistant with audio module to avoid mismatch of tone id values
between telephony & audio.

Change-Id: I9911c0e5c71b16120bf49d172c6fa69581202247
CRs-Fixed: 720550
IMS: Deflect call feature

Code changes to support IMS Deflect call feature.

CRs-Fixed: 713856

Conflicts:
telecomm/java/android/telecomm/ConnectionService.java
telecomm/java/android/telecom/InCallAdapter.java
Change-Id: I74b7fd34cad8d49f660fb05bd33becf6ae1de5d2
Compilation fixes on new AoSP

Change-Id: If551c856c1717e2708971568604ae9d7396706ba
Add config for the expire age of partial segment messages.

Set the value to 30 days based on default value in code,
then it could be customized via res overlay mechanism.

Change-Id: Ia219aa59dd009d831abb03b5921763ade38f0c50

Change-Id: I46fda3389a34b99b6e8e5bdb07a16a28ba49ca23
Conflicts:
core/res/res/values/symbols.xml
Introduce a new config item: config_lte_capable

config_lte_capable is set to true when the device is
LTE capable.

CRs-Fixed: 628506

Conflicts:
core/res/res/values/config.xml
core/res/res/values/symbols.xml
Change-Id: I0032ff41a37509eb0acf25f1ee08de6cbd01511e
Add config to send SMS on 1x

When UE is attached to eHRPD network, IMS is registered and
there is an active 1xRTT voice call, the config determines
whether to send SMS over 1x. Default value is true

CRs-Fixed: 565247

Conflicts:
core/res/res/values/symbols.xml
Change-Id: Ie4e00eb57ef439e9383c616cd1b60108bcfd505f
UsbSettings: Add UMS mode support.

Add Usb Mass storage mode support for Android device;
Fix SD card can not be mounted to device when usb cable
is plugged in or unplugged fast and frequently.

Change-Id: I3e2df57be0d24909d4ec3cbe6590a576976a324c
core: jni: fix memory leak in SoundTrigger JNI

jExtras object created in android_hardware_SoundTrigger
JNISoundTriggerCallback::onRecognitionEvent()
is not deleted causing a memory which depletes JNI
JNI local storage during back-to-back SoundTrigger
detections.
Delete jExtra after storing in return object.

Change-Id: Ib7048917b7538a27d4519504b30252879acc5447
CRs-fixed: 733969