App ops from AOSPA (Ty to linuxman94), Change some Estonian translations, ...
[2/2] Settings: Optional statusbar battery icons - Ty Anu6is
Allow hiding of the battery status bar indicato, Ty sigv

Conflicts:
	res/values/ds_strings.xml
Lock before unlock
Update DeviceInfoSettings.java
Conflicts:
	src/com/android/settings/DeviceInfoSettings.java
Update SecuritySettings.java