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: 47f9c5b0

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



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