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

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

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