Merge "Screen record a11y fixes" into rvc-dev am: 11e6ef9438 am: 772fef9780

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

Change-Id: I15b172119fb1cb396cdd7087801282d9e38788fd