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
Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter.

This fix ensures that onFinished() is always called in a syncClient
even if the application lacks the READ_SYNC_SETTINGS permission.

Change-Id: I08ab930c5695dd874227704a54581baae55d281c
Re-add auto brightness configuration UI (1/2)

Change-Id: I457a05983d692098b4f5708e5a75418eafe4d987
Allow adjusting progress on touch events.

Change-Id: Ide0a7ae057a62f3631a32eeaa63f3e04dec5bf54
And some more merge fixes

Change-Id: I6d3471c20e55776e75f3474b57c7db052d04b995
Misc. cleanup.

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

Change-Id: I70fb6c0d20caad7af01a45b4a9374eb107a554a3
Fix hidden navigation bar in expanded desktop mode not being correctly
reflected.

Change-Id: Ie40951c0787d3960a8e6e3b94544632f7633a376
core/SystemUI: EL translations

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I9666255a607cbce8ea8c4898ce929684e7b770bd
Core: NL translation

Change-Id: I53e7aee34a728dc128ebfaac6935679414b131bc
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
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2