Merge "Fix NPE when a shared element doesn't have a matching transitionName." into nyc-support-25.1-dev
am: 864217e225

Change-Id: I84fd776b1c0f6e8e6a038a9bceaa2c4dbcf91059