Merge "Fix NPE in FAB StateListAnimator" into nyc-support-24.1-dev