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

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



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