NFC polling mode (3/3)

Change-Id: Ia03413578d47e7cd0ffb3080778b6a1154cfc651

Conflicts:
	core/java/android/provider/Settings.java
Merge branch 'cm-10.1' of ssh://github.com/abmantis/android_frameworks_base