[automerger skipped] Merge "Fix setAdministratorUids tests on Q" into rvc-dev am: 6a1d55826c -s ours
am skip reason: Change-Id I1b362660de9733bb9f0ede1ed5cf62279bf1c05e with SHA-1 17ab7ac36a is in history
Change-Id: I16bc94e46e253b70ed58f4bbd5d14c1214024f30
This commit is contained in: