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