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

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



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