Merge "Callback in NDEF detection when RF is not activated"
am: 33f0cd9a31

Change-Id: I9f61588a11129b812dec929e9534e590541c711a