Settings: MediaScanner behavior on boot (3/3)

Change-Id: I4f421b437b3bbb4bcf998321ca0507ac84fd0593

Conflicts:
	res/values/arrays_aicp.xml
	res/values/strings_aicp.xml
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java