a better descriptive string for the stock mode toast

i'd rather not have people avoiding it because we look like we
don't have our shit together

Change-Id: Ib4a656cb70d9c59a1f8bd50a5d318d46a7def933
remove duplicate settings from merge

this hides the new respective security settings when N/A to the current
security method chosen.  It also removes duplicate settings and CM's
unnecessary isCmSecurity boolean.

it all works except when adding code to make vibrate work with PIN security.
this did not work with CM's code either even after the code to remove the
preference was disabled.

Change-Id: I7a5c56b72e2fc4ab08de52de88e9613ef6b9183f