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: a21fbffa am: f16a6abf

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



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