Settings: Modify volume override summary for JA translation

Change-Id: Ia9a14def58c7c195ba5c5cf55983b8d33ec8b5a7
Remove lockscreen slide delay option (1/2)

Also enable these options for insecure lockscreen:
* Lock after timeout
* Power button instantly locks
* Owner info

Change-Id: I7737dc9cb1108f7d83b2cea3af9eb313767eb958
Cleanup lockscreen security settings

Since we moved lockscreen security settings to a separate fragment,
these changes we have initially made are not longer needed

Change-Id: Iac07850e974e9ea423fd8908ce1e134a9a2508ef
Merge commit '051bf97604e776d20c701b6361ae8f7b118d8d16' into cm-11.0-sgt7
Merge commit 'd98a006268e69039c7448b7539ac555a28103f7e' into cm-11.0-sgt7
Merge commit '7ed45591acc9b93f20583c0d64dd9c92c5ae7c84' into cm-11.0-sgt7