Merge "Add Nfc Offhost SecureElements feature definition" am: 041c8ab48f am: 5aeb884114
am: 8e02602012

Change-Id: I05b7f78b9ecf099804352f3acf1ef78ac7c4d201