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

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

Change-Id: Ia19b68b0ea1ac904cf7469962ee6c87e413b9457