am 6b6c4618: am 62bc409c: am 11fb9d0d: Merge "Update cts to not require multi-user when managed_users are declared" into lollipop-cts-dev automerge: 3682098

* commit '6b6c46185147b85aad3d185aaf03d8844a723bee':
  Update cts to not require multi-user when managed_users are declared