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

Change-Id: I0ae1d6d17130897fb2f354022336280b5b44ddd8