Merge "Disable yet another flaky AppBarWithCollapsingToolbarTest test." into nyc-support-25.2-dev
am: 396f89ce13

Change-Id: I6ecb04e138a2f297610f2acbabcc8ba7cf56291a