Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev am: f639c4eb am: e5dfabf5

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

Change-Id: Ic0d21e7d9d573a8f453eec55e7aefb6a9ee9b61d