change NFC POLLING_MODE to SCREEN_STATE_ON_LOCKED

Change-Id: I5d111d29b299427629ed8e1b25eea31b9f713f45

Conflicts:
	src/com/android/nfc/NfcService.java
Fix derp: Remove HEAD markers

Change-Id: I54d11a18045c47bf5e74eec2bc50eaf162689311