Fixing audio routing for FM Radio app (which was broken with previous merge)

Change-Id: Ia9f12b60d672a8ebadfd753118a370c75870b261

Conflicts:
	media/java/android/media/AudioService.java