use svc nfc enable/disable which is always the same. am: a0bf597885 am: db8957a353
am: 2a88d089e5

Change-Id: I77b8805304453a06692f9266ffed7a00b11ea70b