Lockscreen: Fix SystemUI crash on initial selection of Custom Background.

Change-Id: I8df4984f4b90d211baa888d380a95fc00a85d1ad
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java

Change-Id: I38ae7730f56c53231432aa571290b0bcd896ed6a
Revert "Lockscreen: Fix SystemUI crash on initial selection of Custom Background."

This reverts commit 28070f9e0b9ef5b43e2a9c2196c5d7c3226100ee.

Conflicts:

	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java

Change-Id: I05ea218fc9390fbf18878eb8a0614bd42f638320