Merge "Simplify keyguard notification count logic" into tm-dev am: f9e8a7fe am: 7627014c am: b350a26e

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



Change-Id: Icacf358f406ddcb552c8c82d6d1f78e88472a061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>