Merge "Changed swipe up from QQS over keyguard to return to keyguard" into tm-qpr-dev am: 1194a7a47b am: 51976e6dc3

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

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