Framework: Enable Speaker on Proximity (1/3)

Change-Id: Ie3271d56b7ed6b1201e13ad3ff7a83ece181cf12

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