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

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

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



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