Merge "No ally notification action when snoozed" into sc-dev am: 98efbe8a...

Merge "No ally notification action when snoozed" into sc-dev am: 98efbe8a am: 2326e5ea am: 71c96b42

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

Change-Id: If9013ccdae680d1f456461713b628d5ca17cb1fe