Merge "Merge "Fix CollapsingToolbarBaseFragment crash on R." into sc-dev am:...

Merge "Merge "Fix CollapsingToolbarBaseFragment crash on R." into sc-dev am: ab3f5195 am: 8e19405d" into sc-v2-dev-plus-aosp am: 835c7469

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

Change-Id: I2c335943886354956984ce91dd4b80d0b4a718a1