Merge "Fix setAdministratorUids tests on Q" am: 2497897867

Change-Id: I1f9a335e4f7b97d2af47745709d90cfdab353154
tree: eb6f3f35f4639802c30875f594bb7dca573b9890
  1. core/
  2. services/
  3. tests/