Merge "Add 25ms guard time after sending END_OF_APDU_SESSION"
am: 328f34a989

Change-Id: Ic1b5eb4482355525400b736b95b1024c16289798