Merge "Detect dismissals on the lockscreen surface" into tm-qpr-dev am: c47fd5dd am: 84b8833d

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



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