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

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

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

Change-Id: I8456ee1f3e7a13b56380f5b4162be8ed229ac003