Merge "Add expiration time to the response when token is returned from the...

Merge "Add expiration time to the response when token is returned from the cached. We only need to add expiration time for the custom tokens" into tm-dev am: 6ccb8cb4 am: c16e2d89

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17595503



Change-Id: I5866582665b8874b2bebf91c9622219b04dd81d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>