Merge "Disable fling on layout update after programmatic shade collapse" into...

Merge "Disable fling on layout update after programmatic shade collapse" into udc-qpr-dev am: 9a4be2f6

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



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