Merge "[automerger skipped] Fix the animation glitch when NSSL adds and removes a HUN in the same frame. am: 5d54f3c761 -s ours" am: 3c9fa4f583 -s ours

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

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

Change-Id: I02aa9b10ea077aea5c4f8f3df61924002fb8ba04