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

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



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