clor picker in landscape

Change-Id: Ib98d869bbd60bfc3d720b52d5179e64cc360e307
Settings: Fix SmsCallService Wakelock

This is a modifided pick from AKOP http://gerrit.aokp.co/#/c/12910/

Change-Id: Ibd51b2d43186edd07a747f72b931e875cd78b3e6

Conflicts:
	src/com/android/settings/service/SmsCallService.java
	src/com/android/settings/vanir/autosms/AlarmReceiver.java
Merge "clor picker in landscape" into jb43
Merge remote-tracking branch 'upstream/jb43' into jb43