core: added national roaming info for Free Mobile in France

  Users of Free Mobile in France (MCC 208 MNC 15)
  can roam on Orange (MNC 01)

Change-Id: I2c0c3940a72262b1257fb1c2dfdd01da652d2959
base: added national roaming info for Play in Poland

Cherry-picked from OmniROM:
https://gerrit.omnirom.org/#/c/3382/

Users of Play in Poland (MCC 260 MNC 06) can roam on
Plus, T-Mobile, Orange (MNCs 01/02/03)

Change-Id: I8ea62b0ca40bac9ced11802ee8ef583d6392a199
National roaming info for Drei in Austria

3AT roams in T-Mobile AT networks

Change-Id: I915edccf92bcbb088fa25b958eb345c624f61597
National roaming info for yesss! in Austria

Change-Id: I930198d3cb311b23752a8c2f54852ebd48d65b86
National roaming info for 3 in Ireland

Change-Id: I451831f4144b72feac1a38ef1e8693cb947d6d7e
base: added national roaming info for Pepephone in Spain

Users of Pepephone in Spain (MCC 214 MNC 06) can roam on Vodafone ES (MCC 214 MNC 01).

Change-Id: I462e8b6bc7ffdc8bdfc92765178f960c71c8009d
Telephony: Add data rat constant

This event constant is used in DcTracker

Change-Id: I1f9b34a8689c43c2586e9e3a92f0453649775d73
(cherry picked from commit f7ca98035479b670ff51bc9298fd7928a5e0f80d)
(cherry picked from commit f4d8f7b8fa390302b9cc51a5640e017ff393dfcc)
(cherry picked from commit 77d810390fbca8cb1d10bce148035fada414e0eb)
core: added national roaming info for Tesco Mobile in Ireland.

Users of Tesco Mobile in Ireland(MCC 272 MNC 11)
  can roam on O2 Ireland (MNC 02)

Change-Id: Ie0b32d51511c2bbc726c43cdec78332397d1ecb9
Forward port SystemUI: HSPA+ Support

Add the ability to recognize HSPA+ by creating a separate case for HSPAP and
include new H+ icons.

Signed-off-by: Bajee11 <bajee11@gmail.com>
Change-Id: I889a28e4b4cb49862b291641df5a00388db87551
Revert "Telephony: Add data rat constant"

This reverts commit 3d3b371c89a1d7fd71fa96b59ebc14a3d7e4894a.
Add missing string
Clear the scan list when an empty list is received

When the framework receives an empty scan list from supplicant, it does
not clear the local list. So the UI will continue to show the previous
scan list even when there are no APs around. So clear the local list,
when an empty list is received.

CRs-Fixed: 552212
Change-Id: I8715bc31ce0df7bd54c96fcf7d7b73592429f12a
wlan: Error handling on PNO failure due to active P2P session.

If set PNO fails due to concurrent active p2p sessions,
handle the error condition in framework and issue a
regular scan for every framework background scan interval
until set PNO is either success or disabled.

Change-Id: Ia4e8d9aef9ed24e534cb57cea7c8ba7a7ffc509e
CRs-Fixed: 568458
Close sockets on wpa_supplicant termination.

Framework does not close the sockets on supplicant
termination, leading to leakage of file descriptors.

Thus close the socket on supplicant termination.

Change-Id: I50aefc6d60b3794288564f403a42258442e224df
CRs-Fixed: 576276
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.

Change-Id: Ic0bc6f0110c3ecbbce9eccd9357818a8a898475e
wlan: Fix for delay in PNO scan trigger after p2p disconnect.

If PNO is disabled due to concurrent active p2p session,
on P2P disconnect PNO scan is not triggered until the next
framework scan is scheduled.
To mitigate this issue trigger the PNO scan on receiving
P2P_CONNECTION_CHANGED intent in disconnect state of the
wifi state machine.

Change-Id: I9de116f4c82ce103a5787f91b7c7129748fee517
CRs-Fixed: 584058
framework/base: get proper obb mountpoint based on user handle

Due to invalid obb mount point, CTS test case was failing to mount
obb file at /mnt/shell/emulated/0. Added new API to support user
based mount point for obb.

Change-Id: I9f113bd98ab3a4af00dd7f788b2dc3bc45627d6c
CRs-Fixed: 587497
Revert "Irda: Add Irda System Service for Samsung devices"

This reverts commit 596280ba54cd06edefe01d7970b1610563e8103f.

Conflicts:
	core/res/res/values/symbols.xml
	services/java/com/android/server/SystemServer.java

Conflicts:
	core/java/android/app/ContextImpl.java
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
Revert 'Add missing string' as it's already in our oct_strings