Correct active display settings naming

Change-Id: Ibfa2d41eed01d8987df52f013b111a0ce4e70739

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