[automerger skipped] Fix crash when running UserSwitcherControllerTest am: f69d25f7f2 am: 67f75ac19a am: a832c265bc -s ours
am skip reason: Merged-In I34539a5e9678b308b4d3a03e4593fb9385e7831f with SHA-1 f69d25f7f2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363327
Change-Id: I6d53e319bdd4364aede70b1ec88923a710151462
This commit is contained in: