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