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

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

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