Merge "Fix the animation glitch when NSSL adds and removes a HUN in the same frame." into sc-v2-dev am: e6275c8a45

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

Change-Id: Iee4134fd6534f01e605d54527368e06ed35fb33a