[automerger skipped] Merge "Move keyguard multi-user icon into container view" into sc-qpr1-dev am: d7997c2497 -s ours
am skip reason: Merged-In Iadbd29bd7c50cd20a86f966d3f7ec69cd78c9744 with SHA-1 56276a2cc5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15854527
Change-Id: I63bdf92c12066c458410f07f5dedaa2621c989d5
This commit is contained in: