App ops

Change-Id: I07ff53dde8c3be5c34ee7f18d8addcb59849f585

Conflicts:
	res/xml/settings_headers.xml