Merge branch 'kk44' of https://github.com/wSedlacek/packages_apps_Settings into kk44

Change-Id: Iaab32bd8a145b6b0d24e1d3126582c791f03785d
[2/2] Settings: Hide power menu on lockscreen

Base: https://gerrit.omnirom.org/#/c/4700/

Change-Id: Ic485195060c071f120022a52cfd85226b0c3a414
Conflicts:
	res/values/mahdi_strings.xml
	res/xml/power_menu_settings.xml
Merge branch 'kk44' of https://github.com/wSedlacek/packages_apps_Settings into kk44