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

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



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