Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat

PS2: fix merge derp

Conflicts:
	src/com/android/settings/DisplaySettings.java

Change-Id: I1b058750e91bb5e41dd70a7796278e20d5618436
MSIM: Status & Subscriptions Status themes & navigation

Fixes navigation between screens via ActionBar (default behavior on
Settings activities) and switches old Holo theme to Kitkat default
for Status screen on MultiSim devices.

Change-Id: Ia643d645a29b067f4f149a4bec8d4e444a0750fc
Bluetooth: Acquire wakelock to turn on lcd during Connection

This patch acquires wakelock to turn on LCD display of DUT if screen
is off during connection access request for PBAP/MAP. Without this
patch it was observed that if screen was off, lcd remained off for
incoming connection access request from remote device and user only
was hearing notification sound without lcd being lit up.

Change-Id: I87c296fce4cd8e0c133f74169d991eee263fed08
CRs-Fixed: 650261
Bluetooth: Fix for device gets stuck in pairing

Fix for device gets stuck in pairing when trying to pair to two
devices one after the other or simultaneous. Now second pairing
is blocked when first pairing is ongoing.

Change-Id: Ib7e6788243a38b3a0dd864bee2b0797305468e27
CRs-fixed: 610056
Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy-staging

Conflicts:
	src/com/android/settings/DisplaySettings.java