Merge "AppBarLayout + CollapsingToolbarLayout tests fixes" into nyc-support-24.1-dev
am: 48e5d3d43d

Change-Id: I987e2c4e83afdde64633a03c7bc682f6077bac84