Cleanup Security/Privacy settings code

Cleanup:
* Mismerges
* Code style
* Copyright headers
* File permissions

Change-Id: I6c34586680f0ccbaa613a0acfee366113c32a81c

Conflicts:
	res/values/cm_arrays.xml
Settings: use CMHW serial number

See http://review.cyanogenmod.org/57164

Change-Id: If328ca7b487435b88246d1f8c47b04770183f09e