Merge branch 'cm-11.0' of https://github.com/temasek/android_frameworks_base into HEAD

Conflicts:
	services/java/com/android/server/connectivity/Tethering.java

Change-Id: I4e144153038228709d087eae0cebd416803c9162
Heads up: option to disable in lockscreen (1/2)

Change-Id: I6d191528362535f5965d4e0960f4f5631da01a3e