Merge "[User Switcher] Remove duplicate views." into tm-qpr-dev am: 66bd4e79 am: 11100bc0

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



Change-Id: I91731386b3d0c051e8ce24770d8541e08cc5840c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>