Bluetooth: Fix to connect PANU from the internet access menu

isPrefered is always true for PAN. So PANU connect fails,
Once user clicks on the internet access menu in Profiles
Setting. As PAN is not auto connect profile, So PANU should
connect from the internet access menu in Profiles Setting.

Change-Id: I6007c848e7c2703dc97f7f2113356a7aaeed0a0e
CRs-Fixed: 545350
Settings(MSIM): Add TuneAway and PrioritySub to MultiSimSettings

1. Add support for TuneAway and PrioritySub UI options in
MultiSimSettings
2. Add setDefaultVoiceSub, setTuneAway and setPrioritySub
OEM HOOK requests in OSS space

Change-Id: I3b1bc4ed98b3ed7b280938878ba9d7bdb244fcf9
CRs-fixed: 464483
Merge "Bluetooth: Fix to connect PANU from the internet access menu"
Merge "Settings(MSIM): Add TuneAway and PrioritySub to MultiSimSettings"
Add support for below network modes info in hidden menu

 LTE/WCDMA
 TD-SCDMA only
 TD-SCDMA and WCDMA
 TD-SCDMA and LTE
 TD-SCDMA and GSM
 TD-SCDMA,GSM and LTE
 TD-SCDMA, GSM/WCDMA
 TD-SCDMA, WCDMA and LTE
 TD-SCDMA, GSM/WCDMA and LTE
 TD-SCDMA, GSM/WCDMA, CDMA and EvDo
 TD-SCDMA, LTE, CDMA, EvDo GSM/WCDMA

Add support for other network modes in set preferred
network mode UI option in phone information in hidden menu

Change-Id: Id3fd9a27be84e85f4f32a0fd2a7eee9eec545227
CRs-Fixed: 569944
WifiSettings: Handle DISABLED_ASSOCIATION_REJECT.

Upon receiving multiple association rejects for a network,
framework disables corresponding network providing reason
code as DISABLE_ASSOCIATION_REJECT. this is handled
in order to provide appropriate user experience.

CRs-fixed: 484247
Change-Id: I3d344068a58d2dfd82c9bc8b23f43fdf980cc4d9
Packages: Fix for SAP turn ON/OFF fails issue.

Turnig ON/OFF SAP repeatedly when WIFI is ON results
in command CMD_SET_AP being received in WifiStaEnabledState
of the state machine, which will not be handled and because
of this SoftAP is not turned ON and we receive no events
thus the check box remains greyed out/disabled.

To resolve this wait for WIFI_STATE_CHANGED intent before
re-enabling the SAP.

Change-Id: I1a37ac6406ea5e342d6dcb80654c2728fa447e57
CRs-Fixed: 525872
Merge "Add support for below network modes info in hidden menu"
Merge "WifiSettings: Handle DISABLED_ASSOCIATION_REJECT."
Merge "Packages: Fix for SAP turn ON/OFF fails issue."
Settings: Show Service State status in Phone Status properly

When the network mode is data only mode, the voice service state
would be OOS. In such cases, data service state is not checked to
show the phone status UI. Fix to consider data service state also to
update the UI properly.

Change-Id: I20fb6ea3256d0fe4a534fbb781e664d7ce774a05
CRs-Fixed: 517234
Merge "Settings: Show Service State status in Phone Status properly"
MSIM : Enhance UI when no SIM / single SIM is present

As part of this change, the following UI enhancements are done:
1)"SIM card info not available.Menu cannot be accessed" will be
displayed to user on accessing the multiSIM menu when
no SIM card is inserted
2)If a single SIM is inserted, only Configure
subscriptions menu inside Multi SIM setting will be accessible
to the user.The remaining options will be grayed out
3)If multiple SIM cards are inserted, all options inside
Multi SIM setting will be accessible

In case of airplane mode, based on the availability of
SIM card info the UI specified above is displayed

Change-Id: Id41f3b3260ed72dbf43413d49da9b9e5019aef69
CRs-Fixed: 554727
Merge "MSIM : Enhance UI when no SIM / single SIM is present"
Integrate Superuser into Settings
Add preference for enabling root access (3/3)

* Root over ADB is now disabled by default on non-eng builds
* Requires support in su binary and adbd
* Root access can be configured to use ADB only, apps only, or all

Change-Id: I132a35a31c676511db954ff19120fa6d3c795b23

Conflicts:
	src/com/android/settings/DevelopmentSettings.java
Add recaf version to About Phone