Merge "Set nfc.initialized system property after NFC is initialized."
am: 0e34916e41

Change-Id: I806af483402d83bd73cc808d6d4baf2383bccfd7