Merge "Don't expand the panel on ACTION_CANCEL if the keyguard is fading...

Merge "Don't expand the panel on ACTION_CANCEL if the keyguard is fading away." into sc-v2-dev am: 0363d752 am: 44783e47

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

Change-Id: Ib2be9a5f4be688ca30cae1fff25f410c0cd9d4ab