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: If2bbbbedfd677b11cec69550448f0036ba95178c