Merge "Fix one-icon shelf flicker on lockscreen swipe-up" into tm-dev am: 49fa2fb7 am: 11f2f911

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



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