fix merge
volume wake fix
Port "Framework Track Control : Switch from broadcast to audio service"

Ordered broadcast is unreliable.
Switch to using the Audio Service's dispatchMediaKeyWithWakeLockToAudioService
as it sends the event to the correct receiver.

Patchset 2 - Switch power widgets over as well
Patchset 3 - Rename handler 'what' message to be more consistent
Patchset 4 - Fix renaming mishap

Change-Id: I022720a551b94637f7b16258dfb6a22234bcb736

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Lockscreen VolCtrls : Don't raise volume on skipTrack

Set mIsLongPress to true when longpress was successful to avoid
volume from being changed on release

Change-Id: I874f7d66248e30535dddfec53ddd299718e3fa3d
add STREAM_FM
Add fm volume control

Change-Id: I8b3a10e3037c5bb3c7c044b86ddf9de5045d3e9d

Conflicts:
	core/res/res/values/strings.xml
	media/java/android/media/AudioService.java

Conflicts:

	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
	media/java/android/media/AudioService.java