Merge "Fix cancel button on screen recording dialog when PSS enabled" into...

Merge "Fix cancel button on screen recording dialog when PSS enabled" into udc-dev am: c2f1f421 am: 442ec2e2 am: 23c3a472 am: 86911a4b

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



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