Merge "Fix positioning bug in user switcher" into sc-dev am: d6a70b8b am:...

Merge "Fix positioning bug in user switcher" into sc-dev am: d6a70b8b am: aaba6a95 am: e08a248a

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

Change-Id: Ibf28b0a63f40ed1ff69bf5204c5675340a13e3dc