Merge "Fix null pointer expection when get CollapsingToolbrDelegate" into tm-dev am: 5381e75c am: bae417b2

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

Change-Id: Ie670893f56743252c36bb808dd207fbce11ba735