Merge changes from topic "am-3dbcf1e334e4452aa574b3fd5eec826a" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Limit the number of concurrently snoozed notifications" into sc-qpr1-dev am: 06de2157 -s ours am: 40ffa103 -s ours am: 6e8239cd -s ours am: 1d3bfdf2 -s ours am: d4163a25 -s ours
  [automerger skipped] Limit the number of concurrently snoozed notifications am: 7d296063 -s ours am: 2742f53b -s ours am: 10ccd9e8 -s ours am: 85c33760 -s ours am: 62c269f0 -s ours