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: 299c3ae7 am: 5771f3de

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

Change-Id: I55854e2f6ad5fc23807eacc1e3c8de37c031233a