[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 -s ours am: 6bc5aa57 -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: Ia54139eecf5e58e8adc7c608f05e5a30ea05aafd