Merge "Make CollapsingToolbarBaseActivity extend FragmentActivity" into sc-dev am: 99a680a50f am: 713e4621d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15124973 Change-Id: I0ba0b2e7441e089aba84db9510028a9a6a8a200e
This commit is contained in: