Move lockscreen buttons options to one place

When you enter "Button actions" you expect to find unlock
options there, not in "Screen security -> Additional options".
Before: http://goo.gl/mX9DMQ
After: http://goo.gl/hPDKyt
Change-Id: Id9913024a46b0237dd2a1a9b0959eaa84aff379b
PrivacyGuard: confirm permissions reset

The button to reset all application permissions to enabled looks
suspiciously like a refresh button. Prompt the user with a confirmation
dialog to make sure they know what they've pressed.

Change-Id: I0444c5bf8e9533feccf890055d34d3200609c6f6
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge "Move lockscreen buttons options to one place" into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0