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

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

Change-Id: Id691a72acf7e7f6cef998ccebc9dc2df04bced39