[automerger skipped] Merge "Fix setAdministratorUids tests on Q" into rvc-dev am: 0b4ad3a9d5 am: c69180459a -s ours
am skip reason: Change-Id I1b362660de9733bb9f0ede1ed5cf62279bf1c05e with SHA-1 824f80b129 is in history
Change-Id: I12f74893d28783a0299ddf24228e7695cfab667f
This commit is contained in: