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

Merge "Collapse shade for buttons that launch activities" into sc-dev am: dbd8e89b am: 8c53befc am: 5d7efc12

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

Change-Id: I9cdba15314f02855d5f1b30fcab520a12f6f40be