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

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

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