Merge "Fix one-icon shelf flicker on lockscreen swipe-up" into tm-dev am:...

Merge "Fix one-icon shelf flicker on lockscreen swipe-up" into tm-dev am: 49fa2fb7 am: 08bab430 am: 6f77d682

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



Change-Id: I9d4bfd80f35f8505e4e669ee855bcd02bee78015
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>