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

Merge "Screen record user switching fixes" into rvc-dev am: 602d9736 am: 174974e4 am: f6329be3

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

Change-Id: I949bf6b64659fe8551706e63f5d22350dc27d313