Merge "Support customize layout in CollapsingToolbarBaseActivity" into sc-dev am: 50ffbb96 am: 254cef06

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15270705

Change-Id: Ieb4d0992ae246c66437eb3c80b1885cd3e399e30