Merge "Configure nfc device node through .conf file" am: aeacb8fcb7 am: 6d8922f4e7
am: 7357630064

Change-Id: Iccdb240e3143c1d7649d382751cabbd6aba414fb