Fix mNFCEventAllowed=UNDEFINED am: ba066c156c
am: 866e529f6e

Change-Id: I73ffa90bf37570f5e2390f6a6074ff0670af2aa3