Merge "Update the collapsing toolbar layout" into sc-dev am: b0e554dc am:...

Merge "Update the collapsing toolbar layout" into sc-dev am: b0e554dc am: 29374ed5 am: b9892abf

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

Change-Id: I21747d7943f9748482b9110f20bf7a404c735fff