SystemUI: Correct TextView & ImageView id's in DockBatteryTile

Should fix the NPE's on startup for devices with dock battery support (Asus)

Change-Id: I5edde8b8a3491eb18a06bf693a33417a3086ae59
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.2
Bluetooth: Add trust device feature.

Add set trust feature where the remote device is marked
as a trusted device for subsequent connection.

CRs-fixed: 523135

Change-Id: I9bde4d7dfe07d9d63b58a661ed2413f45501bd7b
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.2
Merge branch 'cm-10.2' into cm-10.2-wip