Merge "Support customize layout in CollapsingToolbarBaseActivity" into sc-dev am: 50ffbb96c7 am: 254cef067d am: a74695dd6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15270705 Change-Id: I3fa482abbd4cfc1b510f5000a2b20386035569b1
This commit is contained in: