Merge "Fix CollapsingToolbarLayout scrim not being drawn" into nyc-support-25.1-dev
am: 9e34c75622

Change-Id: I95ac0af7bfe6b8a6bf28411f98496f5b288818d9