[automerger skipped] Prevent length underflow in NfcTag.cpp am: 73f392e9 am:...

[automerger skipped] Prevent length underflow in NfcTag.cpp am: 73f392e9 am: 88ea91b2 am: 782c4962 -s ours am: 00bb35fc -s ours am: 5cae4cc2 -s ours
am: 1ffacabc -s ours
am skip reason: change_id Ibdab756410bf55d701875279df3e289dbc9369d6 with SHA1 c7b41a96 is in history

Change-Id: I2bdd7344026639925b8693ebbb1a8c9e1e543a7f