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

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



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