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

Change-Id: Ia96650c75cf0e24aa5f9448940298f0b77767b0b