ProfilesSettings : Allow nfc override (2/2)

Allow user to override nfc state via profiles

Change-Id: I2a401f17ce42b1711588242e0604997e1f5d8399
Clean up CMStats code.

Besides the cleanup, make sure to wait a bit between retries if upload fails for whatever reason.

JIRA:CYAN-1187
Change-Id: Ifca8364721007aadef31b328d22d764ef7cb3b0a
Pie controls: Tweaking UX for pie service (2/2)

This is the Settings application part of the
user settable activation sensitivity patch for pie controls.

For the complete message look at the commit in
frameworks/base.

Patch Set #3:
* Enabled "Very High"
* Changed title from "Sensitivity" to "Responsiveness"
* Display summary

Patch Set #4:
* "Very High" -> "Very high"

Change-Id: I99fbbc94c75b64121fd04ff5deb8f5a10a04a63b
Allow changing auto-brightness responsitivity.

Change-Id: Icf62db26735f9ab7ad63e750a1824eb7823c3d70
Merge "Clean up CMStats code." into cm-10.1
Merge "Allow changing auto-brightness responsitivity." into cm-10.1
Merge "Pie controls: Tweaking UX for pie service (2/2)" into cm-10.1
Merge "ProfilesSettings : Allow nfc override (2/2)" into cm-10.1