Merge "Simplify keyguard notification count logic" into tm-dev am: f9e8a7fe am: aaa1e43e

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



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