Merge f3b7c05d5ab3dbafcb16af9e463a64e16d12466c on remote branch

Change-Id: Ie4edb6ecf39a780ef84782d290a4ab62bab2a58b
Revert "Add support for BeiDou and Glonass"

This reverts commit 9c3c49b082916f83f4ced99ae81647e5c3fc1202
since it picked up the wrong patch for merge
CRs-fixed: 582614

Change-Id: I6e1d45856fa26d470209396980f46ea13e5041db
Add support for BeiDou and Glonass

Add masks for BeiDou amd Glonass
to delete aiding data
CRs-fixed: 582614

Change-Id: I651adcf4f5486c827bea8487e3437f15cd6d8013
Telephony: Set the value of min match according to one property

CTA requires to match 11 phone numbers, so use the value of the property
"persist.env.c.phone.matchnum" to set it 11 in case of CTA tests, but by
default it is 7 without change.

Change-Id: I8cd4105c06c71af1ad242858d8de474459d96ee1
Merge 3e3c71a28905ac434b4418ec1206e895063369b3 on remote branch

Change-Id: Ic122a7e969b01a7d4d56c8d4563aadd20074a514
Merge 15d62b81a89c8c4a08a01e1c1d9eea3c64a52d74 on remote branch

Change-Id: I5aeb1407931c2708c4759c471c45e596c8ef4f82
Merge fd4110e02afed3013aeca099294d4f7259b31d73 on remote branch

Change-Id: I6a37765841340a7cebb251c6332d7c29b69db40e
Merge 34d5259aec8c3ae318ac21fe1bfd837207e71344 on remote branch

Change-Id: I02edd4067b299e34e539db281a6176f8592159a4
Merge "Telephony: Set the value of min match according to one property"
framworks:fix ringtone duplicated in Clock and Phone ringtone

There are two different name ogg file but have same title.
When first boot the phone, it will scan the media files, and
store their infomation to database for audio files, will call
native method parseOGG to parse file and get title, album
information etc. Because there are two file have same title,
so we can find two Cesium in the list of alarm ringtone

Modify AllAudio.mk ,do not copy same title file

CRs-Fixed: 535350

Change-Id: Ibda71c56fc763bb2292288c84889bfd1d38c0113
Keyguard: PIN lock input views flash when SIM status ready

When airplane mode is turned off and DSDS mode is on, cat service
will request RIL to update the SIM card status. When the broadcast
of SIM ready status is received, keyguardview will be reset. So the
PIN lock input view will flash and bring bad user experience.

As there is nothing to update by resetting keyguardview while SIM
is ready. So dismiss the ready status of SIM card.

CRs-Fixed: 537172

Change-Id: I510e8f1e2f08cb946fe47f02b015ae5bf89d5025
Merge 3e656914204f9052b9051ed831010550e2f4d760 on remote branch

Change-Id: I8170e05565cbf7a49a934d1aea64734bd908b032
Merge "Merge 3e656914204f9052b9051ed831010550e2f4d760 on remote branch"
audio: grant focus to qchat application

To achieve QCHAT concurrencies with telephonoy and music player,
QCHAT application should be allowed to run while voice call is
in HOLD/INACTIVE state. Music player should not be granted audio
focus if QCHAT is running.
Add call state, vsid and all_call_states keys so that application
can set/get keyvalues.

Change-Id: Ia8941bf45074dd4edaa9dc236649293496c76e7b
 Audio: SetForceUse config check in AudioService

 - Audio is routed to headset when BT is turned off while audio is
   played on speaker
 - Mediarouter does not have setForce device information when app forces
   audio to speaker. So while disconnecting BT, MediaRouter is routing
   audio to headset instead of speaker.
 - Added check for setforce config in AudioService.

 CRs-Fixed: 578316

Change-Id: Ie929f407bfa12eacd29cf36031024a4a6a979b63
Merge 971799bd88b4523e2ed84453ed0b9d70dc4371d0 on remote branch

Change-Id: Iee71aacaf6d4429120eb398e3787e0dc90820a1c
QuickBoot: don't log boot events when in QuickBoot mode.

Don't need log boot events when booting from QuickBoot mode.

Change-Id: Id381530418c09ac1d650f45e7a368dbd7945aff3
Merge "Merge 971799bd88b4523e2ed84453ed0b9d70dc4371d0 on remote branch"
Download: add to support pause/resume download by manual

We add pause and resume API here so that application can
pause and resume downloads manually by DownloadManager.
This contains two points:
1. add pause and resume download APIs.
2. add another paused reason for this download status.

Change-Id: I606b48ca20f43bcc6c119683818c2ab6ff03bfe5
Merge 8e01404ab67413377388c262c6516e874c81bc1d on remote branch

Change-Id: I9688a3b3e23206f970cb24c16612328f65132f0b