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

[automerger skipped] Merge "Move keyguard multi-user icon into container view" into sc-qpr1-dev am: d7997c24 am: 2c5f0499 -s ours am: 7eef1b9c -s ours

am skip reason: Merged-In Iadbd29bd7c50cd20a86f966d3f7ec69cd78c9744 with SHA-1 56276a2c is already in history

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

Change-Id: Ie8f7d779bfed25a4986997aaa5995d4fbdfbe5fc