Integrate quite hours active period strings for JA translation

Change-Id: If9c195ecbf9d00f01108185bba1a75be7c115b39
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Settings: Modify volume override summary for JA translation

Change-Id: Ia9a14def58c7c195ba5c5cf55983b8d33ec8b5a7
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
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
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
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
Remove 'More device settings' menu

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

Conflicts:
	res/xml/more_device_settings.xml
	src/com/android/settings/cyanogenmod/MoreDeviceSettings.java
Merge branch 'cm-11.0' of https://github.com/androidarmv6/android_packages_apps_Settings into cm-11.0