Merge "Bouncer - Portrait user switcher tweaks" into tm-dev am: 9d39a4c3 am: c3768f90

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

Change-Id: I867426e64320e231296f20e66e5b507bdab830bd