Merge remote-tracking branch 'github/cm-11.0' into cm-11.0

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

Change-Id: I4b77731a24a6a6b03fa0c4bc8033b96595ce5de9
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0

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

Change-Id: Ife063eab18944a6192e0ef538d66476281d4d4ea
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
TelephonyManager: isSmsCapable: respect telephony properties

The 2 telephony properties override if SMS send/receive is enabled
in the telephony code. Also respect them for the isSmsCapable API.

Use case: Acer A700/701 (Wi-Fi only/3G) share the same build

Change-Id: Iaa1b45c62fa5a48a4c4a222d5e47980dd1678d48
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
base: added national roaming info for Tuenti Movil in Spain

Users of Tuenti Movil in Spain (MCC 214 MNC 05) can roam on Movistar (MCC
214 MNC 07).

Change-Id: Idbb13525d01198f425dc1bff16f5ace5037e7bf5
Don't show notification count for a notification with just one item

For example, the Play Store sets the number attribute to 1 for a single
app update. No point in showing a counter for that.

Change-Id: I818622419f4f043fa8f04339ab24744aca7c1584
Merge "Don't show notification count for a notification with just one item" into cm-11.0
Merge "TelephonyManager: isSmsCapable: respect telephony properties" into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Show owner info creation if no owner is set for UserTile

Forward port from cm-10.2.
Squash of the following commits:

Show owner info creation if no owner is set for UserTile

Change-Id: I43575946023676a1b75b67e1ae1996a0a3a35b88

Fix showing owner info creation from UserTile if no owner is set

* Turns out the default user will always be present, meaning a check of
  user count == 0 fails.

Change-Id: Id8e8e75c5f51c73a60d7b9039298ecb90e572bc9

Show default profile name if no profile exists

Change-Id: I6b651d6b552ab3caf30102d289469eaf68f58a0e

UserTile : Check if profile has a photo

In the event that the profile doesn't have a photo, don't default to the
user's photo, instead show a default avatar.

Change-Id: I80de324ae1e151693cf3716bf87d39a16096ca12