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

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

Change-Id: I213ace58286e2d0e653e0658015a6714f89c9ed4