Merge "Screen record user switching fixes" into rvc-dev am: 602d9736 am: 6433710b

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

Change-Id: I6f6534439ace86b29c42c87a36b2b7e17a99718d