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

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

Change-Id: Ic797e138b5c730692d8b2403b3a43c629aac3aa5