Merge "Fix existing dismissal surfaces, add one for lockscreen" into tm-qpr-dev am: a742754e

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



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