Merge "Fix one-icon shelf flicker after lockscreen swipe-down-and-let-go" into...

Merge "Fix one-icon shelf flicker after lockscreen swipe-down-and-let-go" into tm-dev am: 4f1b1df0 am: 183d96a4 am: 72162d69

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



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