Merge changes from topic "remove_dead_snooze_code" into sc-dev am: f006a648 am: 8fbb4324 am: 6b31acda

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

Change-Id: I5a71f712363f38b10850decb184522b637c983a4