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: 0e47316e

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



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