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

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

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



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