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