Merge "Changes to support reducing noise in active unlock notifications." into...

Merge "Changes to support reducing noise in active unlock notifications." into tm-dev am: c5a7ed29

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

Change-Id: Ibf0591e34654da15e57a8e32230f06e1bacbc6e8