Merge "Fix NPE from startNewTransition" into tm-qpr-dev am: 2a23c2e341

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

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