Nfc Unlock (3/3)

Depends on changes to frameworks/base and Settings

Change-Id: I54ddee9b82d54c303573e02fd73abc758091be29
Merge pull request #1 from Lloir/android-4.4

Nfc Unlock (3/3)