Merge "Pass transition token to finish() for Keyguard" into udc-dev am: 920307da am: 0aa4ba22

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



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