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 am: 3e1427ce

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



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