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: e63b2aeb am: ed544b3d

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

Change-Id: Ia887229e03fa4ddbec4f29c63728b1598374c585