[automerger skipped] Merge "Fix the animation glitch when NSSL adds and removes a HUN in the same frame." into sc-v2-dev am: e6275c8a45 am: c63d199d5f -s ours

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

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

Change-Id: I18f2a23ef8ef890c14b4c4deb738b90d4bf78266