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

Change-Id: I72efcda601c58146175aec190456b8b1b5025490