Suspend Actions (1/2)

Change-Id: I5596f5924f993bcdbeb99e9b865651e095299af3

Conflicts:
	core/java/android/provider/Settings.java