Revert "MediaScanner behavior on boot (1/3)"

This reverts commit 7089ac0ae655af50dc7bfc018dc37d94ad2d6b16.

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