[automerger skipped] Fix the animation glitch when NSSL adds and removes a HUN in the same frame. am: 5d54f3c761 -s ours am: b9b0d89948 -s ours am: 586a4cb0bc -s ours am: 21e4a912dd -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: I3db00c2530bd454048f9c65aa3afcccb05274c65
This commit is contained in: