Merge "Screen record user switching fixes" into rvc-dev am: 602d97360d

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

Change-Id: Icbbd4ecd087b9e4685fc0eb335bc4d6f3faef7d3