Merge "Fixed an issue where icons could be stuck overlapping" into rvc-dev am: 978cb2fe8c

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

Change-Id: I43df2fba7fb1e05dc32f38bf851f0374b676378b