Merge "Fix cancel button on screen recording dialog when PSS enabled" into udc-dev am: c2f1f421

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



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