am 3682098c: Merge "Update cts to not require multi-user when managed_users are declared" into lollipop-cts-dev

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