NFC Polling Mode (3/3)

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

Change-Id: I03ca3d3a963152bd20d240773efa339a8240c53f