Merge "Don't animate the power button dialog when swiping up dismiss shade"...

Merge "Don't animate the power button dialog when swiping up dismiss shade" into tm-qpr-dev am: 2f47e8a8 am: c77b56a5 am: e7da4e16

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



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