Merge "Collapse shade for buttons that launch activities" into sc-dev am: dbd8e89bff am: 6d0b9ae456

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

Change-Id: I259d2efc6151591dbb9f197eb86811c821241640