[automerger skipped] [automerger] [DO NOT MERGE]Prevent length underflow in NfcTag.cpp am: 96a10332c8 am: 4675f8788b am: d2dbaf8b16 am: f5ada89db2 skipped: a3e20aea92 am: a2f7debf2a -s ours am: c945f93b66 -s ours am: 5c1eaee4b3 -s ours am: defc59b616 -s ours am: e66551fd49 -s ours
am: 011e538f02 -s ours
am skip reason: change_id Ibdab756410bf55d701875279df3e289dbc9369d6 with SHA1 73f392e982 is in history

Change-Id: I6fe7a19667a25e7db2b584f37b024f5ac0e65bdf