DayDream: remove duplicates

Fixes AOSPA-69

Change-Id: Iffaef61a54227ffb3eb6388631ce9dd67a5246b6
Fix some merge conflicts

Change-Id: Ie39b24687fcccf452d25968f17fb69bc47312f71
Merge remote-tracking branch 'pa_upstream/kitkat' into legacy
Settings : Add tap/pay help url

Change-Id: I41f37dff0fa2eb547f84aaf776950f0f42e6e36f
Settings: Import CM DA strings

Change-Id: I49ac831de36231c1f216f5c3e6831e7f01eb2836
Revert "Add Xperia Settings to Legacy parts"

This reverts commit a67cf790570ef058abb4ae076dc89144d8ce663f.

Change-Id: Ia82f89ca8394e9d3dcf7dc80d2dfccdbe6fa9bc7
Merge branch 'github/kitkat'

Change-Id: Ifbb45a72d64b8c95d1dfb43385ab863aa0025407