NFC polling mode (3/3)

Change-Id: Ia03413578d47e7cd0ffb3080778b6a1154cfc651
(cherry picked from commit 260500e1dee9a21dc440206a7bf4abeb40df05dc)

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