HALO fix speech fade out

Change-Id: I3e8cccb2b2884824ab1f3193ecadced4e014211e

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java
Telephony: fix typo

Change-Id: Ic13235744fca561cff4d49ae5c799420c30a3840
Fix merge error to build VoicePlus, and some minor clean up

Adding this missing line to ISms.aidl fixes build errors for VoicePlus

Change-Id: If2055a8f740c9f2e9c3db9f80db5f752f040e859

Originally Authored by : M4570D0N
Allow adjusting progress on touch events.

Change-Id: Ide0a7ae057a62f3631a32eeaa63f3e04dec5bf54
Re-add lockscreen music controls toggle.

Change-Id: I70fb6c0d20caad7af01a45b4a9374eb107a554a3
Prefer artist over album artist.

E.g. when playing a compilation title, one very likely wants to see the real
artist instead of 'Various artists'.

Change-Id: Ie200f2f8b0b90d3470c2e2e4ca6f91f9b117fb1f