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: 11f2f911 am: 6d4bd234

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



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