am 4b711553: am 289079d8: 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 '4b7115531293641cea9a7d195f5128c1af6e1dd0':
  Update cts to not require multi-user when managed_users are declared