[automerger skipped] Fix the animation glitch when NSSL adds and removes a HUN...

[automerger skipped] Fix the animation glitch when NSSL adds and removes a HUN in the same frame. am: 5d54f3c7 -s ours am: ee21aec7 -s ours am: 0ab1d054 -s ours

am skip reason: Merged-In I755fff6944da0699d9cb7e6b2456e4811f7888d5 with SHA-1 f87c4e7b is already in history

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

Change-Id: If92782f9b440df18c427652f8aa13b5d9a8ac140