Merge "Fix notifications count change during animation on keyguard" into...

Merge "Fix notifications count change during animation on keyguard" into tm-dev am: 4f81748b am: eb3a5d22 am: cc526c78

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



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