Merge "Prevent Keyguard quick affordance from stealing touch while in QS" into...

Merge "Prevent Keyguard quick affordance from stealing touch while in QS" into tm-qpr-dev am: 931859a1

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



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