Nfc Unlock (2/3)

Change-Id: Icf7a6290d269cbd958aa48265c8bde659f409735

Conflicts:
	core/java/android/provider/Settings.java