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

Merge "Merge "Fix one-icon shelf flicker on lockscreen swipe-up" into tm-dev am: 49fa2fb7 am: 08bab430 am: 1ca2625d" into tm-qpr-dev-plus-aosp am: 1d834781

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



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