Merge "Merge "Nfc: Vts: modify WriteInvalidAndThenValidCommand" into oc-dev am: 55f3ddf53b am: d56f85aded" into oc-dr1-dev-plus-aosp
am: b1ea3006ac

Change-Id: Ic3918bc533945300d528e2c5656fda277e73c07d