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: 5195557d

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



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