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: 7c040ad1 am: 137374fd am: 0b0a9d88

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

Change-Id: I1789f2a23f125e51ee185f3eb9568ee4cb3ba97b