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: Ie84c7d930be8dbba6adaa7562a82a17adcafbc30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>