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 am: 865f6438

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



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