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

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



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