Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_frameworks_base into jb43-legacy

(cherry picked from commit c7e700c240284a9e8c318900806917c7d65e17ca)
Fix dock intent lookup.

PackageManagerService doesn't support UserHandle.USER_CURRENT passed in,
so always pass in the real user ID.

Change-Id: I86ed3cc41ee52628da874500d280f722501233cf
(cherry picked from commit 50153f456ebc41e63cfce39d29ca858804b2136e)
Revert "Ported: Bluetooth Message Access Profile (MAP) from CM9"

This reverts commit 0e5fdcffdd1c3f1292a7cfa04660c966f70c883a.

MAP: Support MAP Server role on Bluedroid with javax.OBEX lib.

Handle No END OF BODY for MAP 1.0 Server Get request. Only the
last packet need send the 0x49(End of Body). For intermediate
packets, we need to send 0x48 (Body).

Move definitions for MAP or FTP Service Specific UUID and
Request type for CONNECTION_ACCESS_REQUEST intent to
BluetoothExt APK.

Change-Id: I04cfeb8d53b8f8c19160a2de1eb448a7ec1f2c41
CRs-fixed: 504042
(cherry picked from commit b574bbf17944ba0289f173d27fd7d6e0add01da5)
services: Fix the bug in NFC shutdown logic

nfcOff should be checked for NFC shutdown instead of radioOff,
which is used for radio status.

Change-Id: Iafd620dc89ae8bed7855e313676527d4de32cb7c
(cherry picked from commit aab84f0928991cdba89a958656b729eb2f3f7904)
Remove duplicated methods

Change-Id: Icd92a44bc9e1b55cbb10e8325f4b92404ad4a645
(cherry picked from commit de0c98775f831d5f03ffcf95ab9af8fe27228d1c)