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: 6f77d682" into tm-qpr-dev-plus-aosp am: c60287fb

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



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