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

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

Change-Id: Ieec60e0cfde2aafb209ae006723bf9e642a58b27