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

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

Change-Id: Ie15bd6e966272b03da3a45f0a2d0b4dbb4421609