Merge "Pass transition token to finish() for Keyguard" into udc-dev am: 920307da3a am: af1ae25017 am: e30e6302e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23711124 Change-Id: Iab27f5085b5245c8e07312d64bbc323a8ce6cedd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: