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