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 am: d1354723

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



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