Merge "Return the auth token to begin call when timestamp token is required." am: 70d788a442 am: 424dcbdd72

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1692705

Change-Id: I86624abf39809aa04cc15f6d38a482f99b5ba077