Merge "Fix existing dismissal surfaces, add one for lockscreen" into...

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

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



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