Merge "Collapse shade for buttons that launch activities" into sc-dev am: dbd8e89b am: 38652301 am: 649f7b65

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

Change-Id: I87a3afd1f5e6c09942d74216ee4cd2dbaf4f82a6