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: 959afa05

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



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