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

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I23a27957b8bc2f64116d4fd8aff0107686b27b84