[automerger skipped] Merge "Move keyguard multi-user icon into container view"...

[automerger skipped] Merge "Move keyguard multi-user icon into container view" into sc-v2-dev am: 212b756f am: 6c6bf6b9 -s ours

am skip reason: Merged-In Iadbd29bd7c50cd20a86f966d3f7ec69cd78c9744 with SHA-1 3c272a68 is already in history

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

Change-Id: I18d97e8e64c519059a19f550d4febcb048f52e2c