Merge "Fix crash due to null leash on transition" into udc-dev am: 51fa66ef...

Merge "Fix crash due to null leash on transition" into udc-dev am: 51fa66ef am: 6cbbd0ff am: 60d213c2 am: e1e3cdc4

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



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