[3/3] frameworks/base: National Data Roaming

Credits: CyanogenMod

Linked commits:
        opt/telephony: https://gerrit.paranoidandroid.co/#/c/3655/
        services/Telephony: https://gerrit.paranoidandroid.co/#/c/3656/

Change-Id: I0280d516067e1ef50f7321355cbee42009657d7e

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java
Revert "Battery icon:Fix battery % not showing up on lock screen"

This reverts commit 5ffe7408b12e0aac30d810d02cd5913d0341d098.
Revert "Cleanup battery style code"

This reverts commit 54a7ae26c46b081fc82232fdf9e8ea3bf20a94da.

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Cleanup battery style code

* Cleanup commented out code
* Fix landscape battery icon padding
* Fix landscape battery icon charging indicator
* Fix circle battery frame color on some black backgrounds
* Fix percentage not shown while charging
* Fix landscape battery icon percentage indicator
* Fix circle battery artifact on low percentage

Change-Id: Ic56878c26e9a3416149eaaa8a9325d56d664e22e

Conflicts:
	packages/SystemUI/res/layout/msim_keyguard_status_bar.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Base: forward port Headsup options (1/2)

-Global on/off
-Blacklist and Do not disturb

Conflicts:
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
HeadsUp: add timeout option (1/2)

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
HeadsUp: Swipe options

-left swipe dismiss
-right swipe put into background
-swipe down opens notification drawer and moves the notification into it
HeadsUp: do not show if notification drawer is visible