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 am: 335d2a27

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

Change-Id: I88574288b70f71ab24e8a0a33d2e47ef5a68c889