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: 11f2f911 am: 6d4bd234" into tm-qpr-dev-plus-aosp am: 915808ba

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



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