Merge "Fix UserSwitchTransitionViewMediatorTest" into rvc-qpr-dev am: c7d1702343

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

Change-Id: If4c3df24af706e33c595f0840cf5427a6f8e33e4