Make the lock screen camera widget configurable (2/2)

Change-Id: I704ddeb4a1b8ba4537d961334138b6661f8dbc31
Merge "Make the lock screen camera widget configurable (2/2)" into cm-11.0
Merge branch 'upstream/cm-11.0'