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: 1ca2625d

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



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