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: 6bbceace13 -s ours am: 701204863d -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: I938845b9b939e596ba676ca7e1327e73b4cd29eb
This commit is contained in: