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

Merge "Fixed an issue where icons could be stuck overlapping" into rvc-dev am: 978cb2fe am: d84feccf am: 691e0bab

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

Change-Id: I8e53764367283f0fd194442dda6f883047bdb081