Merge "AppBarLayout + CollapsingToolbarLayout tests fixes" into nyc-support-24.1-dev