Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev
am: 2219875ebe

Change-Id: I939f13ce785de2eb7e795a6fcdc4de4a42b4ad9e