Merge "Prevent NotificationShelf from jump cutting notifications when...

Merge "Prevent NotificationShelf from jump cutting notifications when appearing" into udc-dev am: 64cc3cbf am: aa13f097

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



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