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

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



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